diff --git a/res/deepin/debian/changelog b/res/deepin/debian/changelog index 2b1230f..c5be295 100644 --- a/res/deepin/debian/changelog +++ b/res/deepin/debian/changelog @@ -1,8 +1,12 @@ -io.github.msojocs.wechat-devtools (1.05.2203070-7) unstable; urgency=medium +io.github.msojocs.wechat-devtools (BUILD_VERSION) unstable; urgency=medium * fix: - - cli - * 兼容 - - ubuntu16.04 + - 国内网络vscode-ripgrep安装失败的问题 + - 内部的更新检查界面无法正常使用 + - 修复可能出现扩展宿主意外终止的问题 + * feat: + - 主题深浅跟随系统变化, 感谢icepie的参与 + * update: + - 更新nwjs与nodejs - -- msojocs Wed, 23 Mar 2022 14:56:04 +0800 + -- msojocs Mon, 11 Mar 2022 14:56:04 +0800 diff --git a/tools/build-deb.sh b/tools/build-deb.sh deleted file mode 100755 index 5a59571..0000000 --- a/tools/build-deb.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -# 参数: -# $1 - 版本 v1.05.2203030-2 | continuous - -set -e -notice() { - echo -e "\033[36m $1 \033[0m " -} - -fail() { - echo -e "\033[41;37m 失败 \033[0m $1" -} - -root_dir=$(cd `dirname $0`/.. && pwd -P) -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//\"/}" -echo $BUILD_VERSION -if [ -n "$1" ];then - export BUILD_VERSION=$1 -fi -if [ -z "$BUILD_VERSION" ];then - export BUILD_VERSION='continuous' -fi -if [ "$BUILD_VERSION" == "continuous" ];then - export BUILD_VERSION="v${DEVTOOLS_VERSION}-continuous" -fi -echo $BUILD_VERSION - -############ 构建deb包 ################ -root_dir=$(cd `dirname $0`/.. && pwd -P) -echo "root_dir: $root_dir" -tmp_dir="$root_dir/tmp" -app_dir="$root_dir/tmp/deb" - -notice "检查版本号" -INPUT_VERSION=$( echo $BUILD_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 -notice "Make Dirs" -mkdir -p $app_dir/opt/wechat-devtools/bin -mkdir -p $app_dir/usr/{src,bin} -mkdir -p $app_dir/usr/share/{metainfo,icons,applications} - -notice "COPY Files" -cp -r "$root_dir/res/deb/data"/* $app_dir -cp "$root_dir/bin/wechat-devtools" "$app_dir/opt/wechat-devtools/bin" -cp "$root_dir/res/template.desktop" "$app_dir/usr/share/applications/wechat-devtools.desktop" -sed -i 's#Icon=dir/res/icons/wechat-devtools.svg#Icon=wechat-devtools#' "$app_dir/usr/share/applications/wechat-devtools.desktop" -sed -i "s#dir#/opt/wechat-devtools#" "$app_dir/usr/share/applications/wechat-devtools.desktop" -sed -i "s/BUILD_VERSION/${BUILD_VERSION//v/}/" "$app_dir/DEBIAN/control" -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" -rm -rf "$app_dir/opt/wechat-devtools/nwjs"/{node,node.exe} -if [ -f "$root_dir/node/bin/node" ];then - cd "$app_dir/opt/wechat-devtools/nwjs" && rm -rf node node.exe - cp "$root_dir/node/bin/node" "$app_dir/opt/wechat-devtools/nwjs/node" - cd "$app_dir/opt/wechat-devtools/nwjs/" && ln -s "node" "node.exe" -fi - -notice "BUILD DEB Package" -cd "$root_dir/tmp/deb" -ls -l "$root_dir/tmp/deb" -mkdir -p "$root_dir/tmp/build" -if [[ $NO_WINE == 'true' ]];then - BUILD_MARK='no_wine' -else - BUILD_MARK='wine' -fi -dpkg-deb -b . "$root_dir/tmp/build/WeChat_Dev_Tools_${BUILD_VERSION}_amd64_${BUILD_MARK}.deb" diff --git a/tools/build-deepin.sh b/tools/build-deepin.sh index 73af988..3e33b86 100755 --- a/tools/build-deepin.sh +++ b/tools/build-deepin.sh @@ -57,9 +57,12 @@ notice "COPY Files" cp -r "$root_dir/res/deepin"/* $build_dir mv "$build_dir/opt/apps/io.github.msojocs.wechat-devtools"/* $base_dir rm -r "$build_dir/opt/apps/io.github.msojocs.wechat-devtools" -sed -i "s/BUILD_VERSION/${BUILD_VERSION//v/}/" "$build_dir/debian/control" "$base_dir/info" +sed -i "s/BUILD_VERSION/${BUILD_VERSION//v/}/" "$build_dir/debian/control" "$build_dir/debian/changelog" "$base_dir/info" sed -i "s/io.github.msojocs.wechat-devtools/$package_name/g" "$base_dir/info" "$build_dir/debian/control" "$build_dir/debian/changelog" \cp -rf "$root_dir/bin/wechat-devtools" "$base_dir/files/bin/bin/wechat-devtools" +# 时间 +build_time=$(LANG=en_US date '+%a, %d %b %Y %H:%M:%S %z') +sed -i "s#[A-Za-z]\+, [0-9]\+ [A-Za-z]\+ [0-9]\+ [0-9]\+:[0-9]\+:[0-9]\+ +[0-9]\+#${build_time}#" "$build_dir/debian/changelog" # desktop \cp -rf "$root_dir/res/template.desktop" "$base_dir/entries/applications/$package_name.desktop"