fix: Can not open terminal in git manage.

7 files changed, 47 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e76a1fb3faa..b3fbf6798722 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wechat-devtools
 	pkgdesc = WeChat Devtools Linux version.
 	pkgver = 1.05.2201240
-	pkgrel = 10
+	pkgrel = 11
 	epoch = 2
 	url = https://github.com/msojocs/wechat-devtools-linux
 	arch = x86_64
@@ -17,28 +17,26 @@ pkgbase = wechat-devtools
 	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 = logo.svg
 	source = fix-cli.sh
 	source = fix-menu.sh
-	source = fix-cloudconsole.sh
+	source = fix-core.sh
 	source = rebuild-modules.sh
 	source = fix-package-name-node
-	source = fix-webview-manager.sh
-	source = logo.svg
 	source = wxvpkg_pack
 	source = wxvpkg_unpack
-	source = fix-wcc-wcsc.sh
+	source = fix-other.sh
 	md5sums = b6f49803c51d0abacca2d1e566c7fe19
 	md5sums = 85552bae33e98eb186c5068419efce03
 	md5sums = 2280bfbbf29981fd5adce334f40146ff
 	md5sums = c638ccefe09941372903c08ce70420c3
-	md5sums = 37bb63ce480d6dfd2a722facfdd66bd4
-	md5sums = SKIP
+	md5sums = baf0db59fb340793854ac1ef23f68594
+	md5sums = 88e0efe5d58444b3d39695d4fb16d61b
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = 88e0efe5d58444b3d39695d4fb16d61b
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 09920e441d55..a13f469266f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _node_version="16.1.0"
 
 pkgname=wechat-devtools
 pkgver="${_wechat_devtools_ver}"  # 主版本号
-pkgrel=10   # 次版本号release
+pkgrel=11   # 次版本号release
 epoch=2    # 大版本迭代强制更新（维护者变更，尽量不用）
 pkgdesc="WeChat Devtools Linux version. "
 arch=("x86_64")
@@ -32,28 +32,26 @@ source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs
         "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"
+        "logo.svg"
         "fix-cli.sh"
         "fix-menu.sh"
-        "fix-cloudconsole.sh"
+        "fix-core.sh"
         "rebuild-modules.sh"
         "fix-package-name-node"
-        "fix-webview-manager.sh"
-        "logo.svg"
         "wxvpkg_pack"
         "wxvpkg_unpack"
-        "fix-wcc-wcsc.sh")
+        "fix-other.sh")
 md5sums=(b6f49803c51d0abacca2d1e566c7fe19
          "${_wechat_devtools_md5}"
          2280bfbbf29981fd5adce334f40146ff
          c638ccefe09941372903c08ce70420c3
-         37bb63ce480d6dfd2a722facfdd66bd4
-         "SKIP"
+         baf0db59fb340793854ac1ef23f68594
+         88e0efe5d58444b3d39695d4fb16d61b
          "SKIP"
          "SKIP"
          "SKIP"
          "SKIP"
          "SKIP"
-         88e0efe5d58444b3d39695d4fb16d61b
          "SKIP"
          "SKIP"
          "SKIP")
@@ -86,7 +84,7 @@ build() {
     export NW_VERSION=$_nwjs_ver
     export srcdir=$srcdir
     
-    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
+    for script in fix-package-name-node fix-cli.sh fix-other.sh fix-menu.sh fix-core.sh rebuild-modules.sh; do
         _log "run ${script}"
         "${srcdir}/${script}"
     done
diff --git a/fix-cloudconsole.sh b/fix-core.sh
index cfad0fefa278..a53b724e269d 100755
--- a/fix-cloudconsole.sh
+++ b/fix-core.sh
@@ -7,21 +7,30 @@ tmp_dir=$(mktemp -d)
 # unpack 文件 到 路径
 node "$srcdir/wxvpkg_unpack" "$package_dir/core.wxvpkg" "$tmp_dir/core.wxvpkg"
 
+#    ____  _____ ____  _        _    ____ _____    ____ ___  ____  _____ 
+#   |  _ \| ____|  _ \| |      / \  / ___| ____|  / ___/ _ \|  _ \| ____|
+#   | |_) |  _| | |_) | |     / _ \| |   |  _|   | |  | | | | |_) |  _|  
+#   |  _ <| |___|  __/| |___ / ___ \ |___| |___  | |__| |_| |  _ <| |___ 
+#   |_| \_\_____|_|   |_____/_/   \_\____|_____|  \____\___/|_| \_\_____|
+#                                                                        
 
 # find
 open_find_result=$( grep -lr "this.props.onWindowOpenFail());" "$tmp_dir/core.wxvpkg" )
-token_find_result=$( grep -lr "constructor(){this._sessionToken=\"\",this._tokenMap={}}" "$tmp_dir/core.wxvpkg" )
 echo "云开发控制台启动点: $open_find_result"
-echo "WebSocket token存储对象位置: $token_find_result"
-
-
 # replace
 new_cb_handle="this.props.onWindowOpenFail());Object.keys(window).forEach(key=>{if(!e.window[key]){try{e.window[key]=window[key];}catch(e){console.error(e);}}});"
 sed -i "s/this.props.onWindowOpenFail());/$new_cb_handle/g" $open_find_result
 
+token_find_result=$( grep -lr "constructor(){this._sessionToken=\"\",this._tokenMap={}}" "$tmp_dir/core.wxvpkg" )
+echo "WebSocket token存储对象位置: $token_find_result"
 new_constructor="constructor(){if(window.tokenData){/*有就直接用*/this._sessionToken=window.tokenData._sessionToken;this._tokenMap=window.tokenData._tokenMap;}else{/*没有就新建*/this._sessionToken=\"\",this._tokenMap={};window.tokenData=this;/*新建完要给中间人*/}}"
 sed -i "s#constructor(){this._sessionToken=\"\",this._tokenMap={}}#$new_constructor#g" "$token_find_result"
 
+# open -a Terminal "`pwd`" --> gnome-terminal
+find_result=$( grep -lr 'open -a Terminal "`pwd`"' "$tmp_dir/core.wxvpkg" )
+echo "Terminal启动位置: $find_result"
+new_str="gnome-terminal"
+sed -i "s#open -a Terminal \"\`pwd\`\"#$new_str#g" "$find_result"
 
 # pack 路径 到 文件
 node "$srcdir/wxvpkg_pack" "$tmp_dir/core.wxvpkg" "$package_dir/core.wxvpkg"
diff --git a/fix-wcc-wcsc.sh b/fix-other.sh
index 0c1cdfeba6a6..8f4f80b33714 100755
--- a/fix-wcc-wcsc.sh
+++ b/fix-other.sh
@@ -3,6 +3,15 @@
 package_dir="$NW_PACKAGE_DIR"
 tmp_dir=$(mktemp -d)
 
+# 修复: webview manager
+# 此bug导致以下功能异常: 
+# 1. 代码依赖分析不可用
+# 2. 拓展中的“SERVICE MARKET RECOMMENDS”功能不可用
+echo "fix: webview manager"
+sed -i 's#module.exports = createWebviewManager;#module.exports = createWebviewManager,( /** @type {any} */ (window)).createWebviewManager = createWebviewManager;#g' "$package_dir/js/libs/vseditor/webview-resource/main.js"
+
+# 修复：可视化用的wcc,wcsc
+echo "fix: wcc,wcsc"
 mkdir "$tmp_dir/node_modules"
 cd $tmp_dir && npm install miniprogram-compiler
 # wcc wcsc
diff --git a/fix-webview-manager.sh b/fix-webview-manager.sh
deleted file mode 100755
index 68302d3707f7..000000000000
--- a/fix-webview-manager.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# 修复 webview manager
-# 此bug导致一下功能异常: 
-# 1. 代码依赖分析不可用
-# 2. 拓展中的“SERVICE MARKET RECOMMENDS”功能不可用
-
-package_dir="$NW_PACKAGE_DIR"
-sed -i 's#module.exports = createWebviewManager;#module.exports = createWebviewManager,( /** @type {any} */ (window)).createWebviewManager = createWebviewManager;#g' "$package_dir/js/libs/vseditor/webview-resource/main.js"
\ No newline at end of file
diff --git a/rebuild-modules.sh b/rebuild-modules.sh
index e9e45b5f0e33..9f82685fc227 100755
--- a/rebuild-modules.sh
+++ b/rebuild-modules.sh
@@ -30,6 +30,17 @@ if [ ! -d "$node_modules" ]; then
 fi
 
 # 以下原封复制
+# 代理处理
+echo "尝试取消所有代理"
+unset http_proxy
+unset HTTP_PROXY
+unset https_proxy
+unset HTTPS_PROXY
+unset socket_proxy
+unset SOCKET_PROXY
+unset all_proxy
+unset ALL_PROXY
+
 echo -e "\033[42;37m ######## 版本信息 $(date '+%Y-%m-%d %H:%M:%S') ########\033[0m"
 echo "NW VERSION: $NW_VERSION"
 echo "nw-gyp version: $( nw-gyp --version )"
@@ -37,10 +48,6 @@ echo "node version: $(node --version )"
 echo "npm version: $(npm --version )"
 python --version
 
-if [[ ! -z $https_proxy || ! -z $http_proxy ]]; then
-  echo -e "\033[41;37m 警告: 你设置了代理，这有可能导致安装出现异常 $http_proxy, $https_proxy \033[0m"
-fi
-
 rm -fr "${package_dir}/node_modules/vscode-windows-ca-certs" # the module is only available in windows
 rm -fr "${package_dir}/node_modules/vscode-windows-registry" # the module is only available in windows
 rm -fr "${package_dir}/node_modules/vscode-windows-registry-node" # the module is only available in windows
diff --git a/wechat-devtools.desktop b/wechat-devtools.desktop
index 07d3d458e7b5..ded5c0500388 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/ 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
+Exec=env APPDATA=/opt/wechat-devtools/ USERPROFILE=~ /opt/wechat-devtools/nw --load-extension=~/.config/wechat_devtools/WeappPlugin --custom-devtools-frontend=file:///opt/wechat-devtools/package.nw/js/ideplugin/inspector %U
 Path=/opt/wechat-devtools
 Icon=wechat-devtools
 Type=Application