update: 移除nvm, 修复权限

5 files changed, 16 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72a94aefd42b..214e68219106 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = wechat-devtools
 	pkgdesc = WeChat Devtools Linux version.
 	pkgver = 1.05.2201240
-	pkgrel = 6
+	pkgrel = 7
 	epoch = 2
 	url = https://github.com/msojocs/wechat-devtools-linux
 	arch = x86_64
 	license = unknown
 	makedepends = p7zip
-	makedepends = nvm
 	makedepends = python2
 	depends = wine
 	depends = gconf
@@ -15,6 +14,8 @@ pkgbase = wechat-devtools
 	options = !strip
 	source = nwjs-v0.53.1.tar.gz::https://npm.taobao.org/mirrors/nwjs/v0.53.1/nwjs-sdk-v0.53.1-linux-x64.tar.gz
 	source = wechat_devtools_1.05.2201240_x64.exe::https://dldir1.qq.com/WechatWebDev/release/p-ae42ee2cde4d42ee80ac60b35f183a99/wechat_devtools_1.05.2201240_x64.exe
+	source = node-v16.1.0.tar.gz::https://npm.taobao.org/mirrors/node/v16.1.0/node-v16.1.0-linux-x64.tar.gz
+	source = compiler.tar.xz::https://download.fastgit.org/msojocs/wechat-devtools-linux/releases/download/v0.6/compiler.tar.xz
 	source = wechat-devtools.desktop
 	source = fix-cli.sh
 	source = fix-menu.sh
@@ -26,6 +27,8 @@ pkgbase = wechat-devtools
 	source = wxvpkg_unpack
 	md5sums = b6f49803c51d0abacca2d1e566c7fe19
 	md5sums = 85552bae33e98eb186c5068419efce03
+	md5sums = 2280bfbbf29981fd5adce334f40146ff
+	md5sums = c638ccefe09941372903c08ce70420c3
 	md5sums = a4dd86296db9aa6b55b048b43182d74f
 	md5sums = SKIP
 	md5sums = SKIP
diff --git a/.gitignore b/.gitignore
index a36403575354..6b96f8c19eaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 wechat_devtools*.exe
 nwjs*.tar.gz
+node*.tar.gz
 
 pkg/
 src/
diff --git a/PKGBUILD b/PKGBUILD
index 279500e98f5b..26425c21941f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,20 +14,22 @@ _wechat_devtools_md5="85552bae33e98eb186c5068419efce03"
 _wechat_devtools_exe="wechat_devtools_${_wechat_devtools_ver}_x64.exe"
 _nwjs_ver="0.53.1"
 _install_dir="/opt/wechat-devtools"
-_node_version="v16.1.0"
+_node_version="16.1.0"
 
 pkgname=wechat-devtools
 pkgver="${_wechat_devtools_ver}"  # 主版本号
-pkgrel=6   # 次版本号release
+pkgrel=7   # 次版本号release
 epoch=2    # 大版本迭代强制更新（维护者变更，尽量不用）
 pkgdesc="WeChat Devtools Linux version. "
 arch=("x86_64")
 url="https://github.com/msojocs/wechat-devtools-linux"
 license=('unknown')
 depends=('wine' 'gconf' 'libxkbfile')
-makedepends=('p7zip' 'nvm' 'python2')
+makedepends=('p7zip' 'python2')
 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}"
+        "node-v${_node_version}.tar.gz::https://npm.taobao.org/mirrors/node/v${_node_version}/node-v${_node_version}-linux-x64.tar.gz"
+        "compiler.tar.xz::https://download.fastgit.org/msojocs/wechat-devtools-linux/releases/download/v0.6/compiler.tar.xz"
         "wechat-devtools.desktop"
         "fix-cli.sh"
         "fix-menu.sh"
@@ -39,6 +41,8 @@ source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs
         "wxvpkg_unpack")
 md5sums=(b6f49803c51d0abacca2d1e566c7fe19
          "${_wechat_devtools_md5}"
+         2280bfbbf29981fd5adce334f40146ff
+         c638ccefe09941372903c08ce70420c3
          a4dd86296db9aa6b55b048b43182d74f
          "SKIP"
          "SKIP"
@@ -60,11 +64,9 @@ _log() {
 
 build() {
     # prepare node
-    _log "prepare node ${_node_version}"
+    _log "prepare node v${_node_version}"
+    export PATH="$srcdir/node-v${_node_version}-linux-x64/bin:$PATH"
     unset npm_config_prefix
-    source /usr/share/nvm/init-nvm.sh
-    nvm ls ${_node_version} || nvm install ${_node_version}
-    nvm use ${_node_version}
 
     # prepare nw-gyp
     _log "prepare nw-gyp"
@@ -79,14 +81,13 @@ build() {
     export NW_PACKAGE_DIR="${srcdir}/wechat_devtools/code/package.nw"
     export NW_VERSION=$_nwjs_ver
     export srcdir=$srcdir
-    chmod 777 "${srcdir}/fix-package-name-node"
+    
     for script in fix-package-name-node fix-cli.sh fix-menu.sh fix-cloudconsole.sh rebuild-modules.sh; do
         _log "run ${script}"
         "${srcdir}/${script}"
     done
 
     # cleanup
-    nvm deactivate
     _log "done"
 }
 
diff --git a/fix-cloudconsole.sh b/fix-cloudconsole.sh
index cfad0fefa278..cfad0fefa278 100644..100755
--- a/fix-cloudconsole.sh
+++ b/fix-cloudconsole.sh
diff --git a/fix-package-name-node b/fix-package-name-node
index a7efd69c3ba1..a7efd69c3ba1 100644..100755
--- a/fix-package-name-node
+++ b/fix-package-name-node