1.02.1907160

3 files changed, 27 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdfa2e5a6d45..d74f206f5b6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wechat-devtools
 	pkgdesc = WeChat Devtools Linux version.
-	pkgver = 1.02.1904090
-	pkgrel = 3
+	pkgver = 1.02.1907160
+	pkgrel = 1
 	epoch = 2
 	url = https://mp.weixin.qq.com/debug/wxadoc/dev/devtools/devtools.html
 	arch = x86_64
@@ -11,13 +11,13 @@ pkgbase = wechat-devtools
 	depends = wine
 	depends = gconf
 	options = !strip
-	source = nwjs.tar.gz::https://npm.taobao.org/mirrors/nwjs/v0.24.4/nwjs-sdk-v0.24.4-linux-x64.tar.gz
-	source = wechat_devtools_1.02.1904090_x64.exe::https://dldir1.qq.com/WechatWebDev/1.2.0/201904090/wechat_devtools_1.02.1904090_x64.exe
+	source = nwjs.tar.gz::https://npm.taobao.org/mirrors/nwjs/v0.38.0/nwjs-sdk-v0.38.0-linux-x64.tar.gz
+	source = wechat_devtools_1.02.1907160_x64.exe::https://dldir1.qq.com/WechatWebDev/1.2.0/201907160/wechat_devtools_1.02.1907160_x64.exe
 	source = wechat-devtools.desktop
 	source = logo.svg
-	md5sums = 82f20fe9081201db81652eb066c29f9b
-	md5sums = a6c2354204968cc5aa2b2d291d65ca3c
-	md5sums = c87aedb94fdb27085b00fd7851a21945
+	md5sums = 3ad6fb08c23f1880b5779fe88bbd8eaa
+	md5sums = c028bcf7df41af9154200cb9ed7ebb9a
+	md5sums = 1415f0460ade665a8beeb9e08ff2ee13
 	md5sums = de6f2f282e6d813100474d75d8abfeb9
 
 pkgname = wechat-devtools
diff --git a/PKGBUILD b/PKGBUILD
index a9a39e1dc01d..3068fdc88b11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,17 @@
 
 # 方法来自https://github.com/cytle/wechat_web_devtools重新打包
 
-_wechat_devtools_ver="1.02.1904090"
-_wechat_devtools_url="https://dldir1.qq.com/WechatWebDev/1.2.0/201904090/wechat_devtools_1.02.1904090_x64.exe"
+_wechat_devtools_ver="1.02.1907160"
+_wechat_devtools_url="https://dldir1.qq.com/WechatWebDev/1.2.0/201907160/wechat_devtools_1.02.1907160_x64.exe"
 
 _wechat_devtools_exe="wechat_devtools_${_wechat_devtools_ver}_x64.exe"
-_nwjs_ver="0.24.4"
-_arch="x64"
+_nwjs_ver="0.38.0"
 _install_dir="/opt/wechat-devtools"
-_node_version="v8.11.3"
+_node_version="v11.14.0"
 
 pkgname=wechat-devtools
 pkgver=${_wechat_devtools_ver}
-pkgrel=3
+pkgrel=1
 epoch=2
 pkgdesc="WeChat Devtools Linux version."
 arch=("x86_64")
@@ -22,13 +21,13 @@ url="https://mp.weixin.qq.com/debug/wxadoc/dev/devtools/devtools.html"
 license=('unknown')
 depends=('wine' 'gconf')
 makedepends=('p7zip' 'nvm')
-source=("nwjs.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs_ver}/nwjs-sdk-v${_nwjs_ver}-linux-${_arch}.tar.gz"
+source=("nwjs.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}"
         "wechat-devtools.desktop"
         "logo.svg")
-md5sums=(82f20fe9081201db81652eb066c29f9b
-         a6c2354204968cc5aa2b2d291d65ca3c
-         c87aedb94fdb27085b00fd7851a21945
+md5sums=(3ad6fb08c23f1880b5779fe88bbd8eaa
+         c028bcf7df41af9154200cb9ed7ebb9a
+         1415f0460ade665a8beeb9e08ff2ee13
          de6f2f282e6d813100474d75d8abfeb9)
 options=('!strip')
 
@@ -44,15 +43,16 @@ build() {
 
     cp $(which node) node
 
-    cd ${srcdir}/wechat_devtools/\$APPDATA/Tencent/微信web开发者工具/package.nw
-    sed -i 's/\.isMac?"node-sync-ipc":"node-sync-ipc-nwjs"/.isMac?"node-sync-ipc":"node-sync-ipc"/g' ./js/*.js
-    sed -i 's#-load-extension=\./js#-load-extension=./package.nw/js#' package.json
+    cd ${srcdir}/wechat_devtools/\$APPDATA/Tencent/微信开发者工具/package.nw
     sed -i 's#AppData/Local/\${global.userDirName}/User Data/Default#.config/\${global.userDirName}/Default#g' ./js/common/cli/index.js
     sed -i 's#USERPROFILE#HOME#g' ./js/common/cli/index.js
 
     # rebuild node-sync-ipc
     cd ./node_modules/node-sync-ipc
-    npm run install
+    npm install
+    cd ..
+    rm -rf node-sync-ipc-nwjs
+    cp -r node-sync-ipc node-sync-ipc-nwjs
 
     nvm deactivate
 }
@@ -60,8 +60,10 @@ build() {
 package() {
     mkdir -p ${pkgdir}${_install_dir}
     cd ${pkgdir}${_install_dir}
-    cp -r ${srcdir}/nwjs-sdk-v${_nwjs_ver}-linux-${_arch}/* ./
-    cp -r ${srcdir}/wechat_devtools/\$APPDATA/Tencent/微信web开发者工具/package.nw ./package.nw
+    cp -r ${srcdir}/nwjs-sdk-v${_nwjs_ver}-linux-x64/* ./
+    cp -r ${srcdir}/wechat_devtools/\$APPDATA/Tencent/微信开发者工具/package.nw ./package.nw
+    mkdir -p Tencent/微信开发者工具
+    ln -s ../../package.nw Tencent/微信开发者工具/package.nw
     find ./package.nw -type d | xargs chmod -R a+rx
     cp ${srcdir}/node node
     ln -s node node.exe
diff --git a/wechat-devtools.desktop b/wechat-devtools.desktop
index f391eb6b1c92..98d04035dd2d 100644
--- a/wechat-devtools.desktop
+++ b/wechat-devtools.desktop
@@ -3,10 +3,10 @@ Name=WeChat Devtools
 Name[zh_CN]=微信web开发者工具
 Comment=The development tools for wechat web develop
 Categories=Development;WebDevelopment;IDE;
-Exec=/opt/wechat-devtools/nw -load-extension=./package.nw/js/ideplugin %U
+Exec=env APPDATA=/opt/wechat-devtools/ /opt/wechat-devtools/nw -load-extension=./package.nw/js/ideplugin %U
 Path=/opt/wechat-devtools
 Icon=wechat-devtools
 Type=Application
 Terminal=false
-StartupWMClass=crx_ikhdnebglabgeplgnhnjgldiemdflddf
+StartupWMClass=nwjs_mbeenbnhnmdhkbicabncjghgnikfbgjh
 MimeType=x-scheme-handler/wechatide