cytle · zjsun · Apr 10, 2020 · Apr 10, 2020 · Apr 10, 2020 · Apr 12, 2020
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ npm-debug.log
 /node_modules
 *.log
 winehq.key
+*.iml
+/package.nw/**/*
diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 
 linux 下使用微信web开发者工具.
 
-![wx_dev_tools v1.02.1910121](https://img.shields.io/badge/wx_dev_tools-1.02.1910121-green.svg)
-![nw.js v0.24.4](https://img.shields.io/badge/nw.js-v0.24.4-blue.svg)
+![wx_dev_tools v1.02.2004020](https://img.shields.io/badge/wx_dev_tools-1.02.2004020-green.svg)
+![nw.js v0.38.4](https://img.shields.io/badge/nw.js-v0.38.4-blue.svg)
 
 ## Description
 
@@ -149,9 +149,9 @@ rm -rf /tmp/wxdt_xsp
 1. https://github.com/cytle/wechat_web_devtools/issues/66#issuecomment-368434141
 2. https://github.com/cytle/wechat_web_devtools/issues/56#issuecomment-371999385
 
-### 更新到最新版
+### 更新/升级到最新版（PS：同样适用于在canyoutle/wxdt docker容器中直接操作更新升级）
 
-#### 方案一: 直接从当前项目源码 进行 更新 (稳定, 推荐)
+#### ~~方案一: 直接从当前项目源码 进行 更新 (稳定, 推荐)~~ (源码中版本较旧，已删除，请使用方案二/三更新版本)
 
 ``` bash
 git pull origin
@@ -175,6 +175,15 @@ git pull origin
 ./bin/update_package_nw.sh -l <微信开发工具下载地址> -v <版本号>
 ```
 
+#### 方案二/三补充：手动更新nwjs至开发者工具对应的版本  
+通过windows版开发者工具安装文件获取对应使用的nwjs版本，并修改nwjs_v中版本号，然后执行：
+
+``` bash
+./bin/update_nwjs.sh
+```
+
+以上更新后，至少可以 **cli upload** 正常使用啦
+
 *Tips*
 
 - 运行没问题，欢迎PR

diff --git a/bin/fix_cli.sh b/bin/fix_cli.sh
@@ -6,8 +6,8 @@ root_dir=$(cd `dirname $0`/.. && pwd -P)
 sed -ri -e 's/USERPROFILE/HOME/g' $root_dir/package.nw/js/common/cli/index.js
 # config地址替换
 sed -ri -e 's#AppData/Local/\$\{global.userDirName\}/User Data#.config/\$\{global.userDirName\}#g' $root_dir/package.nw/js/common/cli/index.js
-# 应用入口替换
-sed -ri -e 's#`./\$\{global.appname\}.exe`#i.join(__dirname, "../../../../bin/wxdt")#g' $root_dir/package.nw/js/common/cli/index.js
+# 应用入口替换 todo: js压缩后变量名不固定（i.join）
+sed -ri -e 's#`./\$\{global.appname\}.exe`#o.join(__dirname, "../../../../bin/wxdt")#g' $root_dir/package.nw/js/common/cli/index.js
 
 # 默认打开服务端口，TODO 文件hash会改变
 # sed -ri -e 's/enableServicePort:!1/enableServicePort:!!1/g' $root_dir/package.nw/js/5498e660c05c574f739a28bd5d202cfa.js
diff --git a/nwjs_v b/nwjs_v
@@ -1 +1 @@
-0.38.0
+0.38.4
diff --git a/...eps/libgit2/tests/resources/attr/dir/file → package.nw/.gitkeep b/...eps/libgit2/tests/resources/attr/dir/file → package.nw/.gitkeep
diff --git a/package.nw/core.wxvpkg b/package.nw/core.wxvpkg
diff --git a/package.nw/html/about.html b/package.nw/html/about.html
diff --git a/package.nw/html/appservice.html b/package.nw/html/appservice.html
diff --git a/package.nw/html/cloud-functions-debugger.html b/package.nw/html/cloud-functions-debugger.html
diff --git a/package.nw/html/debugger-end.html b/package.nw/html/debugger-end.html
diff --git a/package.nw/html/debugger.html b/package.nw/html/debugger.html
diff --git a/package.nw/html/dev.html b/package.nw/html/dev.html
diff --git a/package.nw/html/editor-dev.html b/package.nw/html/editor-dev.html
diff --git a/package.nw/html/editor.html b/package.nw/html/editor.html
diff --git a/package.nw/html/entrance.html b/package.nw/html/entrance.html
diff --git a/package.nw/html/filediff.html b/package.nw/html/filediff.html