Fix command != not found (#3042)

This commit is contained in:
Kamil Kisiela 2023-10-13 09:54:50 +02:00 committed by GitHub
parent c3ce269156
commit eeaec3fb0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 9 deletions

View file

@ -0,0 +1,5 @@
---
'@graphql-hive/cli': patch
---
Fix command != not found

View file

@ -1,8 +1,8 @@
diff --git a/lib/tarballs/bin.js b/lib/tarballs/bin.js
index 8301c7be4c3101de9caf1c1b127cf1f940a1706c..a552e0e2c9ffea8ec16c3baf509aa2c0f8bd700c 100644
index 8301c7be4c3101de9caf1c1b127cf1f940a1706c..402c146592628c6181576d01988e2f4e3bb654db 100644
--- a/lib/tarballs/bin.js
+++ b/lib/tarballs/bin.js
@@ -7,85 +7,63 @@ const node_child_process_1 = require("node:child_process");
@@ -7,85 +7,65 @@ const node_child_process_1 = require("node:child_process");
const node_util_1 = require("node:util");
const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
async function writeBinScripts({ config, baseWorkspace, nodeVersion }) {
@ -59,7 +59,9 @@ index 8301c7be4c3101de9caf1c1b127cf1f940a1706c..a552e0e2c9ffea8ec16c3baf509aa2c0
SOURCE="\$( readlink "\$SOURCE" )"
# If \$SOURCE was a relative symlink (so no "/" as prefix, need to resolve it relative to the symlink base directory
- [[ \$SOURCE != /* ]] && SOURCE="\$DIR/\$SOURCE"
+ \$SOURCE != /* && SOURCE="\$DIR/\$SOURCE"
+ if [ "\$SOURCE" != /* ]; then
+ SOURCE="\$DIR/\$SOURCE"
+ fi
done
DIR="\$( cd -P "\$( dirname "\$SOURCE" )" && pwd )"
echo "\$DIR"
@ -131,10 +133,10 @@ index 8301c7be4c3101de9caf1c1b127cf1f940a1706c..a552e0e2c9ffea8ec16c3baf509aa2c0
}
exports.writeBinScripts = writeBinScripts;
diff --git a/lib/tarballs/build.js b/lib/tarballs/build.js
index 6dc6c060ccb11346ba9e9d38346521e2fd0b9e77..2bae82a35ec28d306d791ac19897cf85a4c9b3e0 100644
index 384ea4be6bb7179c0622436ce41142b59b226771..943a2516bcc2079107023b9da8f27592a656a7a2 100644
--- a/lib/tarballs/build.js
+++ b/lib/tarballs/build.js
@@ -56,9 +56,10 @@ async function build(c, options = {}) {
@@ -73,9 +73,10 @@ async function build(c, options = {}) {
}
else {
const lockpath = fs.existsSync(path.join(c.root, 'package-lock.json')) ?
@ -147,4 +149,4 @@ index 6dc6c060ccb11346ba9e9d38346521e2fd0b9e77..2bae82a35ec28d306d791ac19897cf85
+ }
await exec('npm install --production', { cwd: c.workspace() });
}
};
};

View file

@ -51,7 +51,7 @@ patchedDependencies:
hash: hxh4emx3aynf2jzsz5rahc4b4y
path: patches/nextra@2.12.3.patch
oclif@3.17.1:
hash: zfq635w2wnfryxdh76ieiqh2e4
hash: kht3qv63ahm725k3oatnyst5dm
path: patches/oclif@3.17.1.patch
importers:
@ -398,7 +398,7 @@ importers:
version: 1.0.2
oclif:
specifier: 3.17.1
version: 3.17.1(patch_hash=zfq635w2wnfryxdh76ieiqh2e4)(@swc/core@1.3.85)(@types/node@18.17.17)(typescript@5.2.2)
version: 3.17.1(patch_hash=kht3qv63ahm725k3oatnyst5dm)(@swc/core@1.3.85)(@types/node@18.17.17)(typescript@5.2.2)
rimraf:
specifier: 4.4.1
version: 4.4.1
@ -25527,7 +25527,7 @@ packages:
resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==}
dev: true
/oclif@3.17.1(patch_hash=zfq635w2wnfryxdh76ieiqh2e4)(@swc/core@1.3.85)(@types/node@18.17.17)(typescript@5.2.2):
/oclif@3.17.1(patch_hash=kht3qv63ahm725k3oatnyst5dm)(@swc/core@1.3.85)(@types/node@18.17.17)(typescript@5.2.2):
resolution: {integrity: sha512-qwop0W9s5nJJ9tTdLsYXxxvGSNc9xKjXccEAGCXM+x8NmGtZ4P89FwqDY4PIG7IeV9VNpYhZKQArpZNwPGn0CQ==}
engines: {node: '>=12.0.0'}
hasBin: true