fix

Rocket1184 · Jul 7, 2023 · 14048bf · 14048bf
1 parent 1d29fe3
commit 14048bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/script/ci-build.sh b/script/ci-build.sh
@@ -16,8 +16,8 @@ PLATFORMS=(linux darwin)
 VERSION_HASH=$(git rev-parse --short HEAD)
 PKG_VER="$VERSION_HASH"
 QSHELL_VER="v2.12.0"
-QSHELL_DIR="node_modules/.cache/qshell/$QSHELL_VER"
-QSHELL_BIN="$QSHELL_DIR/bin/qshell-linux-x64-$QSHELL_VER"
+QSHELL_DIR="node_modules/.cache/qshell"
+QSHELL_BIN="$QSHELL_DIR/qshell"
 
 # functions
 build_dist() {
@@ -49,7 +49,7 @@ build_tar() {
 qshell_init() {
     if [ ! -x "$QSHELL_BIN" ] ; then
         curl -Lo "$QSHELL_DIR/qshell.tar.gz" --create-dirs "https://kodo-toolbox-new.qiniu.com/qshell-${QSHELL_VER}-linux-amd64.tar.gz"
-        tar xf "$QSHELL_DIR/qshell.zip" --directory="$QSHELL_DIR/bin"
+        tar xf "$QSHELL_DIR/qshell.tar.gz" --directory="$QSHELL_DIR"
         chmod +x "$QSHELL_BIN"
     fi
     # Usage: qshell account [--overwrite | -w]<Your AccessKey> <Your SecretKey> <Your Account Name>
@@ -63,6 +63,8 @@ qshell_upload() {
     "$QSHELL_BIN" rput "$BUCKET_NAME" "$1" "build/$1"
 }
 
+echo "BUILD_MODE=$BUILD_MODE"
+
 case "$BUILD_MODE" in
 pull_request)
     build_dist

diff --git a/script/webpack.js b/script/webpack.js
@@ -12,8 +12,8 @@ if (argv.length === 0) {
     process.argv = process.argv.slice(0, 2);
 }
 
-// yeah! patch packages!
-cp.execSync('patch-packages');
+// yeah! patch package!
+cp.execSync('patch-package');
 
 process.env.NODE_ENV = 'production';