From 484f25b953657da16b4dddf7aa780ba9f99b6608 Mon Sep 17 00:00:00 2001 From: msojocs Date: Sat, 16 Apr 2022 16:28:01 +0800 Subject: [PATCH] feat: appimage cli --- .github/ISSUE_TEMPLATE/bug_report_cn.md | 2 +- .gitignore | 3 +- bin/wechat-devtools-cli | 4 +- ...github.msojocs.wechat_devtools.appdata.xml | 44 ----------- test/miniumT.py | 10 +++ tools/build-appimage.sh | 13 +++- tools/build-flatpak.sh | 73 ------------------- tools/build-prepare.sh | 3 + tools/build-release.sh | 2 + tools/build-tar.sh | 2 + 10 files changed, 33 insertions(+), 123 deletions(-) delete mode 100644 res/appimage/usr/share/metainfo/io.github.msojocs.wechat_devtools.appdata.xml create mode 100644 test/miniumT.py delete mode 100755 tools/build-flatpak.sh diff --git a/.github/ISSUE_TEMPLATE/bug_report_cn.md b/.github/ISSUE_TEMPLATE/bug_report_cn.md index a7b3558..be80f58 100644 --- a/.github/ISSUE_TEMPLATE/bug_report_cn.md +++ b/.github/ISSUE_TEMPLATE/bug_report_cn.md @@ -8,7 +8,7 @@ assignees: '' --- **预先准备** -1. 删除`~/.config/wechat_devtools`目录，重新打开项目（若发布`issue`即默认阁下执行了此操作且问题没有解决）； +1. 删除`~/.config/wechat-devtools`目录，重新打开项目（若发布`issue`即默认阁下执行了此操作且问题没有解决）； 2. HelloWorld是否正常（登录状态新建默认项目,执行复现步骤）：正常/不正常 **问题描述** diff --git a/.gitignore b/.gitignore index 12a3af6..ef90f6d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ wcsc.bin temp.sh # flatpak .flatpak-builder -build-dir \ No newline at end of file +build-dir +__pycache__ \ No newline at end of file diff --git a/bin/wechat-devtools-cli b/bin/wechat-devtools-cli index 097b8c6..99cea8f 100755 --- a/bin/wechat-devtools-cli +++ b/bin/wechat-devtools-cli @@ -14,4 +14,6 @@ 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" -node $root_dir/package.nw/js/common/cli/index.js "$@" +# 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 - "$@" diff --git a/res/appimage/usr/share/metainfo/io.github.msojocs.wechat_devtools.appdata.xml b/res/appimage/usr/share/metainfo/io.github.msojocs.wechat_devtools.appdata.xml deleted file mode 100644 index ba58938..0000000 --- a/res/appimage/usr/share/metainfo/io.github.msojocs.wechat_devtools.appdata.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - io.github.msojocs.wechat_devtools - MIT - MIT - WeChat Dev Tools - WeChat Dev Tools For Linux - - -

- WeChat Dev Tools For Linux. 微信开发者工具Linux版 - WeChat Dev Tools For Linux. 微信开发者工具Linux版 - WeChat Dev Tools For Linux. 微信开发者工具Linux版 -

-

微信开发者工具Linux版

- - - io.github.msojocs.wechat_devtools.desktop - - - - Main Page - https://raw.githubusercontents.com/msojocs/wechat-web-devtools-linux/master/res/screenshots/1.05.2201240.png - - - - https://github.com/msojocs/wechat-web-devtools-linux - msojocs - - - - - wechat-web-devtools-linux - - - - - -

Upgrade: 升级工具版本至 1.05.2203030

- - - - \ No newline at end of file diff --git a/test/miniumT.py b/test/miniumT.py new file mode 100644 index 0000000..d7a141d --- /dev/null +++ b/test/miniumT.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python3 +#-- coding: UTF-8 -- +import minium +# print(minium) +mini = minium.Minium({ + "project_path": r"/home/msojocs/Documents/we1", #小程序项目路径 + "dev_tool_path": r"/mnt/disk2/wechat-web-devtools-linux/bin/wechat-devtools-cli",#开发者工具的命令行工具路径 + "test_port": 9420 #minitest自动化端口 +}) +print(mini.get_system_info())#输出开发者工具模拟器的信息 \ No newline at end of file diff --git a/tools/build-appimage.sh b/tools/build-appimage.sh index 638c69d..67fa3be 100755 --- a/tools/build-appimage.sh +++ b/tools/build-appimage.sh @@ -1,5 +1,7 @@ #!/bin/bash +# 构建AppImage + # 参数： # $1 - 版本 v1.05.2203030-2 # $2 - 平台 x86_64 @@ -52,7 +54,7 @@ notice "下载AppImage构建工具 ACTION_MODE:$ACTION_MODE" if [[ $ACTION_MODE == 'true' ]]; then appimagetool_host="github.com" else - appimagetool_host="download.fastgit.org" + appimagetool_host="github.rc1844.workers.dev" fi if [ ! -f "$tmp_dir/appimagetool-x86_64.AppImage" ];then wget "https://$appimagetool_host/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" \ @@ -69,13 +71,18 @@ mkdir -p $app_dir/usr/share/{metainfo,icons} notice "COPY FILES" cp "$root_dir/bin/wechat-devtools" "$app_dir/bin/wechat-devtools" +cp "$root_dir/bin/wechat-devtools-cli" "$app_dir/bin/wechat-devtools-cli" cp "$root_dir/res/icons/wechat-devtools.png" "$app_dir/wechat-devtools.png" \cp -rf "$root_dir/res/appimage"/* "$app_dir" cp $app_dir/usr/share/applications/*.desktop "$app_dir/io.github.msojocs.wechat_devtools.desktop" -cat > "$app_dir/AppRun" <<- EOF +cat > "$app_dir/AppRun" <<- 'EOF' #!/bin/bash -exec \$APPDIR/bin/wechat-devtools +if [[ $1 == 'cli' ]];then + exec $APPDIR/bin/wechat-devtools-cli ${@:2} +else + exec $APPDIR/bin/wechat-devtools +fi EOF chmod +x "$app_dir/AppRun" diff --git a/tools/build-flatpak.sh b/tools/build-flatpak.sh deleted file mode 100755 index 2b78e43..0000000 --- a/tools/build-flatpak.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -# 参数： -# $1 - 版本 v1.05.2203030-2 -# $2 - 平台 x86_64 - -set -e -notice() { - echo -e "\033[36m $1 \033[0m " -} -fail() { - echo -e "\033[41;37m 失败 \033[0m $1" -} - -if [ -n "$1" ];then - export VERSION=$1 -fi -if [ -n "$2" ];then - export ARCH=$2 -fi - -root_dir=$(cd `dirname $0`/.. && pwd -P) -tmp_dir="$root_dir/tmp" -app_dir="$tmp_dir/Flatpak" -build_dir="$tmp_dir/build" -mkdir -p $build_dir - -notice "检查版本号" -DEVTOOLS_VERSION=$( cat "$root_dir/package.nw/package.json" | grep -m 1 -Eo "\"[0-9]{1}\.[0-9]{2}\.[0-9]+" ) -DEVTOOLS_VERSION="${DEVTOOLS_VERSION//\"/}" -INPUT_VERSION=$( echo $VERSION | sed 's/v//' | sed 's/-.*//' ) -# if [[ "$INPUT_VERSION" != "$DEVTOOLS_VERSION" ]];then -# fail "传入版本号与实际版本号不一致！" -# exit 1 -# fi - -# Remove any previous build -rm -rf $app_dir -# Make usr and icons dirs -mkdir -p $app_dir/bin - -notice "COPY FILES" -cp "$root_dir/bin/wechat-devtools" "$app_dir/bin/wechat-devtools" -cp "$root_dir/res/icons/wechat-devtools.svg" "$app_dir/io.github.msojocs.wechat_devtools.svg" -\cp -rf "$root_dir/res/flatpak"/* "$app_dir" -cp $root_dir/res/template.desktop "$app_dir/io.github.msojocs.wechat_devtools.desktop" -sed -i 's/Icon=dir\/res\/icons\/wechat-devtools.svg/Icon=io.github.msojocs.wechat_devtools/' "$app_dir/io.github.msojocs.wechat_devtools.desktop" -sed -i 's/Exec=dir\/bin\/wechat-devtools/Exec=startup/' "$app_dir/io.github.msojocs.wechat_devtools.desktop" -cp -r "$root_dir/package.nw" "$app_dir/package.nw" -cp -r "$root_dir/nwjs" "$app_dir/nwjs" -if [ -f $root_dir/node/bin/node ];then - rm -rf "$app_dir/nwjs/node" "$app_dir/nwjs/node.exe" - cp "$root_dir/node/bin/node" "$app_dir/nwjs/node" - cd "$app_dir/nwjs/" && ln -s "node" "node.exe" -fi - -notice "MAKE FLATPAK" - -cd $app_dir - -# 此处关键参照 https://unix.stackexchange.com/questions/412869/how-to-allow-gui-application-in-flatpak-to-run-cli-tool -cat > startup.sh <<- 'EOF' -#!/bin/sh -export PATH="/var/run/host/usr/bin:$PATH" -export LD_LIBRARY_PATH="/app/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH" -exec /app/opt/bin/wechat-devtools -EOF - -# flatpak-builder build-dir io.github.msojocs.wechat-devtools.yml --force-clean - -flatpak-builder build-dir io.github.msojocs.wechat-devtools.yml --force-clean --install --user - -flatpak run io.github.msojocs.wechat-devtools \ No newline at end of file diff --git a/tools/build-prepare.sh b/tools/build-prepare.sh index 3e9d837..5dc2349 100755 --- a/tools/build-prepare.sh +++ b/tools/build-prepare.sh @@ -1,5 +1,8 @@ #!/bin/bash +# 用于github actions构建 +# 解压初步构建后的文件 + # 脚本执行前提，已完成支持wine的基本构建 set -e success() { diff --git a/tools/build-release.sh b/tools/build-release.sh index 1c9fea6..f97cfbe 100755 --- a/tools/build-release.sh +++ b/tools/build-release.sh @@ -1,5 +1,7 @@ #!/bin/bash +# 打包成tar.gz & 构建AppImage + # 参数： # $1 - 版本 v1.05.2203030-2 # $2 - 平台 x86_64 diff --git a/tools/build-tar.sh b/tools/build-tar.sh index ad760a0..8e70f09 100755 --- a/tools/build-tar.sh +++ b/tools/build-tar.sh @@ -1,5 +1,7 @@ #!/bin/bash +# 打包成tar.gz + # 参数： # $1 - 版本 v1.05.2203030-2 # $2 - 平台 x86_64