diff --git a/bin/wechat-devtools-cli b/bin/wechat-devtools-cli index 99cea8f..bb52a4c 100755 --- a/bin/wechat-devtools-cli +++ b/bin/wechat-devtools-cli @@ -12,8 +12,6 @@ cd $root_dir export WECHAT_DEVTOOLS_DIR="$root_dir/nwjs" export APPDATA="$root_dir/nwjs" -export PATH="$root_dir/wine:$root_dir/node/bin:$root_dir/nwjs:$PATH" +export PATH="$root_dir/node/bin:$root_dir/nwjs:$PATH" -# node $root_dir/package.nw/js/common/cli/index.js "$@" -# const t=e.customScriptName?e.$0:o.basename(e.$0), -echo "process.argv[1]='$root_dir/bin/wechat-devtools-cli';require('$root_dir/package.nw/js/common/cli/index.js')" | node - "$@" +node $root_dir/package.nw/js/common/cli/index.js "$@" diff --git a/bin/wechat-devtools-snap b/bin/wechat-devtools-snap deleted file mode 100644 index 96a7362..0000000 --- a/bin/wechat-devtools-snap +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -echo "SNAP 启动" -root_dir=$(cd `dirname $0`/.. && pwd -P) -echo "root_dir: $root_dir" -ls -l "$root_dir" - -export WECHAT_DEVTOOLS_DIR="$root_dir/nwjs" -export APPDATA="$SNAP_USER_DATA/.config/wechat_devtools" -export PATH="$root_dir/wine:$root_dir/node/bin:$root_dir/nwjs:$PATH" -export USERPROFILE=$SNAP_USER_DATA - -ls -l /usr/lib/x86_64-linux-gnu -ls -l /usr/lib - -echo -e "\033[46;37m环境变量: \033[0m" -env -# LANG=zh_CN.UTF-8 exec "$DIR"/../nwjs/nw --load-extension="$DIR"/../nwjs/package.nw/js/ideplugin "$@" - -EXTENSION1="--load-extension=$SNAP/package.nw/js/ideplugin" -EXTENSION2="--load-extension=$SNAP_USER_DATA/.config/wechat_devtools/WeappPlugin" -INSPECTOR1="--custom-devtools-frontend=file://$SNAP/package.nw/js/ideplugin/inspector" # 要加file://指明为本地文件路径 -INSPECTOR2="--custom-devtools-frontend=file://$SNAP_USER_DATA/.config/wechat_devtools/WeappPlugin/inspector/" -USERDATADIR="$SNAP_USER_DATA/.config/wechat_devtools" - -# "$@"参数 -LANG=zh_CN.UTF-8 -"$SNAP/nw" $EXTENSION2 $INSPECTOR1 "$@" \ No newline at end of file diff --git a/changelog.md b/changelog.md index 236ef79..21cc15e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +# 1.05.2204250-2 / 2022-05-11 +- fix: 修复wcc编译器不支持单文件编译的bug +- fix: 修复cli异常 + # 1.05.2204250-1 / 2022-04-26 - update: devtools 1.05.2204250 - update: 跟进wcc编译器变更 diff --git a/tools/fix-cli.sh b/tools/fix-cli.sh index 5ebc4e5..3cd6479 100755 --- a/tools/fix-cli.sh +++ b/tools/fix-cli.sh @@ -14,3 +14,4 @@ cd "$NW_PACKAGE_DIR" sed -i 's#AppData/Local/\${global.userDirName}/User Data/\${global.productHash}/Default#.config/\${global.userDirName}/Default#g' js/common/cli/index.js sed -i 's#USERPROFILE#HOME#g' js/common/cli/index.js sed -i 's#`./\${global.appname}.exe`#`./bin/\${global.appname}`#g' js/common/cli/index.js +sed -i 's#,""));const T#,""));_.$0="wechat-devtools-cli";const T#' js/common/cli/index.js