diff --git a/test/core-test b/test/core-test index 5f3d3ed..f10ab1b 100644 --- a/test/core-test +++ b/test/core-test @@ -4,9 +4,10 @@ root_dir=$(cd `dirname $0`/.. && pwd -P) a=$1 if [ "$a" == '1' ];then rm -rf "$root_dir/package.nw/core.wxvpkg.ext" - node tools/wxvpkg/unpack "$root_dir/package.nw/core.wxvpkg" "$root_dir/package.nw/core.wxvpkg.ext" + node tools/wxvpkg_unpack.js "$root_dir/package.nw/core.wxvpkg" "$root_dir/package.nw/core.wxvpkg.ext" else - node tools/wxvpkg/pack package.nw/core.wxvpkg.ext package.nw/core.wxvpkg + node tools/wxvpkg_pack.js package.nw/core.wxvpkg.ext package.nw/core.wxvpkg rm -rf ~/.config/wechat_devtools/WeappCache + rm -rf ~/.config/wechat_devtools/WeappVendor bin/wechat-devtools fi \ No newline at end of file diff --git a/tools/build-deb.sh b/tools/build-deb.sh index 21e4ae8..35135c1 100755 --- a/tools/build-deb.sh +++ b/tools/build-deb.sh @@ -39,7 +39,7 @@ if [[ ! $BUILD_VERSION -eq 'continuous' ]];then else sed -i "s/BUILD_VERSION/0/" "$app_dir/DEBIAN/control" fi -cp "$root_dir/res/icons/wechat-devtools.png" "$app_dir/usr/share/icons/wechat-devtools.png" +cp "$root_dir/res/icons/wechat-devtools.svg" "$app_dir/usr/share/icons/wechat-devtools.svg" cp -r "$root_dir/package.nw" "$app_dir/opt/wechat-devtools/package.nw" cp -r "$root_dir/nwjs" "$app_dir/opt/wechat-devtools/nwjs" @@ -53,4 +53,4 @@ ls -l "$root_dir/tmp/deb" mkdir -p "$root_dir/tmp/build" ver=$( cat "$root_dir/package.nw/package.json" | grep -m 1 -Eo "\"[0-9]{1}\.[0-9]{2}\.[0-9]+" ) ver="${ver//\"/}" -dpkg-deb -b . "$root_dir/tmp/build/WeChat_Dev_Tools_${ver}_$BUILD_VERSION.deb" +dpkg-deb -b . "$root_dir/tmp/build/WeChat_Dev_Tools_${ver}-${BUILD_VERSION}_amd64.deb" diff --git a/tools/fix-core.sh b/tools/fix-core.sh index 024ca85..c194323 100755 --- a/tools/fix-core.sh +++ b/tools/fix-core.sh @@ -52,6 +52,8 @@ if [[ $NO_WINE == 'true' ]];then sed -i "s#{wcc:!0,wcsc:!0,DevToolProtector:!0}#$new_str#g" "$find_result" new_str='"linux"===process.platform' sed -i "s#\"darwin\"===process.platform#$new_str#g" "$find_result" + sed -i 's#return I("wcc")#return I("wcc.bin"),I("wcc")#g' "$find_result" + sed -i 's#return I("wcsc")#return I("wcsc.bin"),I("wcsc")#g' "$find_result" fi current=`date "+%Y-%m-%d %H:%M:%S"`