Radish alpha
r
Radicle web interface
Radicle
Git (anonymous pull)
Log in to clone via SSH
Check that the rad binary used is the same as added to PATH
Sebastian Martinez committed 2 years ago
commit 56eefb86fa4a4038bc95fd8e53604f5ca650efb7
parent 4912d85198f833477a554f2e8fbd877359687d82
1 file changed +8 -4
modified tests/support/support.ts
@@ -29,13 +29,17 @@ export const heartwoodShortSha = (
  await Fs.readFile(`${supportDir}/heartwood-version`, "utf8")
).substring(0, 7);

-
process.env.PATH = [
-
  Path.join(tmpDir, "bin", heartwoodShortSha),
-
  process.env.PATH,
-
].join(Path.delimiter);
+
const binaryPath = Path.join(tmpDir, "bin", heartwoodShortSha);
+
process.env.PATH = [binaryPath, process.env.PATH].join(Path.delimiter);

// Assert that the `rad` CLI is installed and has the correct version.
export async function assertRadInstalled(): Promise<void> {
+
  const { stdout: which } = await execa("which", ["rad"]);
+
  if (Path.dirname(which) !== binaryPath) {
+
    throw new Error(
+
      `rad path doesn't match used rad binary: ${binaryPath} !== ${which}`,
+
    );
+
  }
  const { stdout: version } = await execa("rad", ["--version"]);
  if (!version.includes(heartwoodShortSha)) {
    throw new Error(