From 0434076ea6ab4abf0673d99feaa13768a2e1e7c8 Mon Sep 17 00:00:00 2001 From: Yoshiya Hinosawa Date: Sat, 9 Mar 2019 02:41:47 +0900 Subject: [PATCH] refactor: use execPath where appropriate (denoland/deno_std#255) Original: https://github.com/denoland/deno_std/commit/bf76484301cccbc857cdf205a44762239392ebed --- format.ts | 6 +++--- prettier/main_test.ts | 6 +++--- prettier/util.ts | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/format.ts b/format.ts index 3a28d66509..d5878f27b9 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 ed2274a6bc..718b716af5 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 abbf5a9936..1c5513c8d0 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" : "";