From ad2403378d7f27018e98d07107d0fc761800b867 Mon Sep 17 00:00:00 2001 From: msojocs Date: Tue, 10 May 2022 21:35:04 +0800 Subject: [PATCH] fix: vscode-ripgrep --- .github/workflows/release.yml | 1 + res/aur/PKGBUILD | 2 +- snap/snapcraft.yaml | 1 + tools/rebuild-node-modules.sh | 9 +++++++-- tools/setup-wechat-devtools-bash | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6292b1b..2e4d22a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -279,6 +279,7 @@ jobs: make libssh2 krb5 + wget scripts: "cd tmp/AUR && makepkg && ls -l && cd ../../" - name: Fix Permissions diff --git a/res/aur/PKGBUILD b/res/aur/PKGBUILD index b969cf7..4e0ddd4 100644 --- a/res/aur/PKGBUILD +++ b/res/aur/PKGBUILD @@ -27,7 +27,7 @@ arch=("x86_64") url="https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html" license=('unknown') depends=('gconf' 'libxkbfile') -makedepends=('p7zip' 'python2' 'openssl' 'gcc' 'make' 'libssh2' 'krb5') +makedepends=('p7zip' 'python2' 'openssl' 'gcc' 'make' 'libssh2' 'krb5' 'wget') # compiler 用于可视化,以及编译 source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs_ver}/nwjs-sdk-v${_nwjs_ver}-linux-x64.tar.gz" "${_wechat_devtools_exe}::${_wechat_devtools_url}" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index cb21464..573a30b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -59,6 +59,7 @@ parts: - make - openssl - libssh2-1-dev + - wget override-pull: | ls -l override-build: | diff --git a/tools/rebuild-node-modules.sh b/tools/rebuild-node-modules.sh index 82655cb..4598f3d 100755 --- a/tools/rebuild-node-modules.sh +++ b/tools/rebuild-node-modules.sh @@ -46,8 +46,13 @@ rm -fr "vscode-windows-ca-certs" "vscode-windows-registry" "vscode-windows-regis rm -fr "${package_dir}/node_modules/vscode-ripgrep/bin/"* # redownload bin on linux # https://github.com/microsoft/ripgrep-prebuilt cd "${package_dir}/node_modules/vscode-ripgrep" && \ -mkdir -p tmp && cd tmp && \ -wget https://gh2.yanqishui.work/https://github.com/microsoft/ripgrep-prebuilt/releases/download/v12.1.1-1/ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz -O ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz && \ +mkdir -p tmp && cd tmp + +if [ "$ACTION_MODE" != "true" ]; then + notice "非ACTION模式, 设置镜像源" + prefix="https://gh2.yanqishui.work/" +fi +wget ${prefix}https://github.com/microsoft/ripgrep-prebuilt/releases/download/v12.1.1-1/ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz -O ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz tar xvf ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz -C ../bin && \ cd .. && rm -rf tmp diff --git a/tools/setup-wechat-devtools-bash b/tools/setup-wechat-devtools-bash index 3db2382..faaf16b 100755 --- a/tools/setup-wechat-devtools-bash +++ b/tools/setup-wechat-devtools-bash @@ -42,7 +42,7 @@ if [ ! -f "$root_dir/node/bin/node" ]; then fi # 将node加入环境 export PATH="$root_dir/node/bin":$PATH -if [ $ACTION_MODE!='true' ]; then +if [ "$ACTION_MODE" != "true" ]; then notice "非ACTION模式, 设置镜像源" npm config set registry http://registry.npmmirror.com/ # 注册模块镜像 npm config set disturl http://npmmirror.com/dist # node-gyp 编译依赖的 node 源码镜像