summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xformat.ts6
-rw-r--r--prettier/main_test.ts6
-rw-r--r--prettier/util.ts2
3 files changed, 6 insertions, 8 deletions
diff --git a/format.ts b/format.ts
index 3a28d6650..d5878f27b 100755
--- a/format.ts
+++ b/format.ts
@@ -1,12 +1,12 @@
#!/usr/bin/env deno --allow-run --allow-write --allow-read
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-const { exit, args } = Deno;
+const { exit, args, execPath } = Deno;
import { parse } from "./flags/mod.ts";
-import { xrun, executableSuffix } from "./prettier/util.ts";
+import { xrun } from "./prettier/util.ts";
async function main(opts) {
const args = [
- `deno${executableSuffix}`,
+ execPath,
"--allow-write",
"--allow-read",
"prettier/main.ts",
diff --git a/prettier/main_test.ts b/prettier/main_test.ts
index ed2274a6b..718b716af 100644
--- a/prettier/main_test.ts
+++ b/prettier/main_test.ts
@@ -2,8 +2,8 @@
import { join } from "../fs/path.ts";
import { assertEquals } from "../testing/asserts.ts";
import { test } from "../testing/mod.ts";
-import { xrun, executableSuffix } from "./util.ts";
-const { readAll } = Deno;
+import { xrun } from "./util.ts";
+const { readAll, execPath } = Deno;
const decoder = new TextDecoder();
@@ -19,7 +19,7 @@ async function run(
}
const cmd = [
- `deno${executableSuffix}`,
+ execPath,
"--allow-run",
"--allow-write",
"--allow-read",
diff --git a/prettier/util.ts b/prettier/util.ts
index abbf5a993..1c5513c8d 100644
--- a/prettier/util.ts
+++ b/prettier/util.ts
@@ -8,5 +8,3 @@ export function xrun(opts): Deno.Process {
args: build.os === "win" ? ["cmd.exe", "/c", ...opts.args] : opts.args
});
}
-
-export const executableSuffix = build.os === "win" ? ".exe" : "";