fix: 二维码真机调试

5 files changed, 41 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39e0a8c07bcb..c21b74975ff5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wechat-devtools
 	pkgdesc = WeChat Devtools Linux version.
 	pkgver = 1.05.2201240
-	pkgrel = 8
+	pkgrel = 9
 	epoch = 2
 	url = https://github.com/msojocs/wechat-devtools-linux
 	arch = x86_64
@@ -26,11 +26,12 @@ pkgbase = wechat-devtools
 	source = logo.svg
 	source = wxvpkg_pack
 	source = wxvpkg_unpack
+	source = fix-wcc-wcsc.sh
 	md5sums = b6f49803c51d0abacca2d1e566c7fe19
 	md5sums = 85552bae33e98eb186c5068419efce03
 	md5sums = 2280bfbbf29981fd5adce334f40146ff
 	md5sums = c638ccefe09941372903c08ce70420c3
-	md5sums = a4dd86296db9aa6b55b048b43182d74f
+	md5sums = 37bb63ce480d6dfd2a722facfdd66bd4
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
@@ -40,5 +41,6 @@ pkgbase = wechat-devtools
 	md5sums = 88e0efe5d58444b3d39695d4fb16d61b
 	md5sums = SKIP
 	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = wechat-devtools
diff --git a/PKGBUILD b/PKGBUILD
index b9721f23d61f..6ed7c2317d32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _node_version="16.1.0"
 
 pkgname=wechat-devtools
 pkgver="${_wechat_devtools_ver}"  # 主版本号
-pkgrel=8   # 次版本号release
+pkgrel=9   # 次版本号release
 epoch=2    # 大版本迭代强制更新（维护者变更，尽量不用）
 pkgdesc="WeChat Devtools Linux version. "
 arch=("x86_64")
@@ -40,12 +40,13 @@ source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs
         "fix-webview-manager.sh"
         "logo.svg"
         "wxvpkg_pack"
-        "wxvpkg_unpack")
+        "wxvpkg_unpack"
+        "fix-wcc-wcsc.sh")
 md5sums=(b6f49803c51d0abacca2d1e566c7fe19
          "${_wechat_devtools_md5}"
          2280bfbbf29981fd5adce334f40146ff
          c638ccefe09941372903c08ce70420c3
-         a4dd86296db9aa6b55b048b43182d74f
+         37bb63ce480d6dfd2a722facfdd66bd4
          "SKIP"
          "SKIP"
          "SKIP"
@@ -54,6 +55,7 @@ md5sums=(b6f49803c51d0abacca2d1e566c7fe19
          "SKIP"
          88e0efe5d58444b3d39695d4fb16d61b
          "SKIP"
+         "SKIP"
          "SKIP")
 options=('!strip')
 
@@ -84,7 +86,7 @@ build() {
     export NW_VERSION=$_nwjs_ver
     export srcdir=$srcdir
     
-    for script in fix-package-name-node fix-cli.sh fix-menu.sh fix-cloudconsole.sh fix-webview-manager.sh rebuild-modules.sh; do
+    for script in fix-package-name-node fix-cli.sh fix-wcc-wcsc.sh fix-menu.sh fix-cloudconsole.sh fix-webview-manager.sh rebuild-modules.sh; do
         _log "run ${script}"
         "${srcdir}/${script}"
     done
diff --git a/fix-wcc-wcsc.sh b/fix-wcc-wcsc.sh
new file mode 100755
index 000000000000..0c1cdfeba6a6
--- /dev/null
+++ b/fix-wcc-wcsc.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+package_dir="$NW_PACKAGE_DIR"
+tmp_dir=$(mktemp -d)
+
+mkdir "$tmp_dir/node_modules"
+cd $tmp_dir && npm install miniprogram-compiler
+# wcc wcsc
+# 预览编译
+# cd "${package_dir}/js/vendor/" && rm -rf "wcc.exe"
+# cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcc" "${package_dir}/js/vendor/wcc.exe"
+# wcc_md5=$( md5sum wcc.exe|cut -d ' ' -f1 ) && \
+# sed -i  's/wcc.exe": ".*"/wcc.exe": "'"${wcc_md5}"'"/g' "config.json"
+# cd "${package_dir}/js/vendor/" && rm -rf "wcsc.exe"
+# cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcsc" "${package_dir}/js/vendor/wcsc.exe"
+# cd "${package_dir}/js/vendor" && \
+# wcsc_md5=$( md5sum wcsc.exe|cut -d ' ' -f1 ) && \
+# sed -i  's/wcsc.exe": ".*"/wcsc.exe": "'"${wcsc_md5}"'"/g' "config.json"
+
+# 可视化编译
+(cd "${package_dir}/node_modules/" \
+&& rm -rf wcc wcsc \
+&& mkdir -p "wcc/bin/linux" "wcsc/bin/linux" \
+&& cp -r "${tmp_dir}/node_modules/miniprogram-compiler/bin/linux/wcc" "wcc/bin/linux/wcc" \
+&& cp -r "${tmp_dir}/node_modules/miniprogram-compiler/bin/linux/wcsc" "wcsc/bin/linux/wcsc" \
+&& cp -r "${srcdir}/compiler/wcc_node"/* "wcc" \
+&& cp -r "${srcdir}/compiler/wcsc_node"/* "wcsc"
+)
+
+rm -rf $tmp_dir
\ No newline at end of file
diff --git a/rebuild-modules.sh b/rebuild-modules.sh
index c70cb9fc6a31..e4f57a7bc588 100755
--- a/rebuild-modules.sh
+++ b/rebuild-modules.sh
@@ -74,7 +74,6 @@ rm -fr "${package_dir}/node_modules_tmp/node_modules/spdlog-node"
     trash \
     vscode-oniguruma \
     vscode-ripgrep \
-    miniprogram-compiler \
     nodegit \
     --registry=https://registry.npm.taobao.org \
     --nodegit_binary_host_mirror=https://npm.taobao.org/mirrors/nodegit/v0.27.0/) # reinstall modules
@@ -101,28 +100,6 @@ cp -fr "${package_dir}/node_modules_tmp/node_modules/nodegit" "${package_dir}/no
 mkdir -p "${package_dir}/node_modules/vscode-ripgrep/bin"
 cp -fr "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep/bin/rg" "${package_dir}/node_modules/vscode-ripgrep/bin/rg"
 
-# wcc wcsc
-# 预览编译
-# cd "${package_dir}/js/vendor/" && rm -rf "wcc.exe"
-# cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcc" "${package_dir}/js/vendor/wcc.exe"
-# wcc_md5=$( md5sum wcc.exe|cut -d ' ' -f1 ) && \
-# sed -i  's/wcc.exe": ".*"/wcc.exe": "'"${wcc_md5}"'"/g' "config.json"
-# cd "${package_dir}/js/vendor/" && rm -rf "wcsc.exe"
-# cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcsc" "${package_dir}/js/vendor/wcsc.exe"
-# cd "${package_dir}/js/vendor" && \
-# wcsc_md5=$( md5sum wcsc.exe|cut -d ' ' -f1 ) && \
-# sed -i  's/wcsc.exe": ".*"/wcsc.exe": "'"${wcsc_md5}"'"/g' "config.json"
-
-# 可视化编译
-(cd "${package_dir}/node_modules/" \
-&& rm -rf wcc wcsc \
-&& mkdir -p "wcc/bin/linux" "wcsc/bin/linux" \
-&& cp -r "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcc" "wcc/bin/linux/wcc" \
-&& cp -r "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcsc" "wcsc/bin/linux/wcsc" \
-&& cp -r "${srcdir}/compiler/wcc_node"/* "wcc" \
-&& cp -r "${srcdir}/compiler/wcsc_node"/* "wcsc"
-)
-
 rm -rf "${package_dir}/node_modules_tmp"
 
 # 移除旧配置
diff --git a/wechat-devtools.desktop b/wechat-devtools.desktop
index 9061eb0d8e11..07d3d458e7b5 100644
--- a/wechat-devtools.desktop
+++ b/wechat-devtools.desktop
@@ -3,7 +3,7 @@ Name=WeChat Devtools
 Name[zh_CN]=微信web开发者工具
 Comment=The development tools for wechat web develop
 Categories=Development;WebDevelopment;IDE;
-Exec=env APPDATA=/opt/wechat-devtools/ /opt/wechat-devtools/nw --load-extension=/opt/wechat-devtools/package.nw/js/ideplugin --custom-devtools-frontend=file:///opt/wechat-devtools/package.nw/js/ideplugin/inspector %U
+Exec=env APPDATA=/opt/wechat-devtools/ USERPROFILE=~ /opt/wechat-devtools/nw --load-extension=/opt/wechat-devtools/package.nw/js/ideplugin --custom-devtools-frontend=file:///opt/wechat-devtools/package.nw/js/ideplugin/inspector %U
 Path=/opt/wechat-devtools
 Icon=wechat-devtools
 Type=Application