Skip to content

Commit

Permalink
Do not manually quote install-dir command (#1023)
Browse files Browse the repository at this point in the history
Since we are now quoting the arguments directly in the `runEdegDbCli`
function, we do not need to quote this argument manually.
  • Loading branch information
scotttrinh authored May 17, 2024
1 parent 2e2f007 commit 9083bc6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,6 @@ jobs:
with:
deno-version: v1.x

- name: Install EdgeDB
uses: edgedb/setup-edgedb@6763b6de72782d9c2e5ecc1095986a1c707da68f
with:
cli-version: stable

- name: Install dev deps
run: |
yarn --frozen-lockfile
Expand Down
5 changes: 3 additions & 2 deletions packages/driver/src/cli.mts
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ async function writeCliLocationToCache(cliLocation: string) {

async function selfInstallFromTempCli(): Promise<string | null> {
debug("Self-installing EdgeDB CLI...");
runEdgeDbCli(["_self_install"], TEMPORARY_CLI_PATH);
const cmd = IS_TTY ? ["_self_install"] : ["_self_install", "--quiet"];
runEdgeDbCli(cmd, TEMPORARY_CLI_PATH);
debug(" - CLI self-installed successfully.");
return getCliLocationFromCache();
}
Expand Down Expand Up @@ -379,7 +380,7 @@ function getBaseDist(arch: string, platform: string, libc = ""): string {

function getInstallDir(cliPath: string): string {
debug("Getting install directory for CLI path:", cliPath);
const installDir = runEdgeDbCli(["info", "--get", "'install-dir'"], cliPath, {
const installDir = runEdgeDbCli(["info", "--get", "install-dir"], cliPath, {
stdio: "pipe",
})
.toString()
Expand Down

0 comments on commit 9083bc6

Please sign in to comment.