diff --git a/wechat/license/etc/lsb-release b/wechat/license/etc/lsb-release deleted file mode 100644 index 0c83ec8..0000000 --- a/wechat/license/etc/lsb-release +++ /dev/null @@ -1,4 +0,0 @@ -DISTRIB_ID=uos -DISTRIB_RELEASE=20 -DISTRIB_DESCRIPTION="UnionTech OS 20" -DISTRIB_CODENAME=plum diff --git a/wechat/license/etc/os-release b/wechat/license/etc/os-release deleted file mode 100644 index 714c4e5..0000000 --- a/wechat/license/etc/os-release +++ /dev/null @@ -1,8 +0,0 @@ -PRETTY_NAME="UnionTech OS Desktop 20 Home" -NAME="uos" -VERSION_ID="20 Home" -VERSION="20 Home" -ID=uos -HOME_URL="https://www.chinauos.com/" -BUG_REPORT_URL="http://bbs.chinauos.com" -VERSION_CODENAME=eagle diff --git a/wechat/license/libuosdevicea.so b/wechat/license/libuosdevicea.so deleted file mode 100755 index f066c2b..0000000 Binary files a/wechat/license/libuosdevicea.so and /dev/null differ diff --git a/wechat/license/var/lib/uos-license/.license.json b/wechat/license/var/lib/uos-license/.license.json deleted file mode 100644 index 73ff2e5..0000000 --- a/wechat/license/var/lib/uos-license/.license.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "confCustomHeadindex": 0, - "confCustomUrl": "", - "confDefault": true, - "confDefaultIndex": 0, - "defaultUrl": [ - "https://license.chinauos.com", - "https://license1.chinauos.com" - ], - "options": [ - {"protocol": "https://", "address": ""}, - {"protocol": "http://", "address": ""}, - {"protocol": "kms://","address": ""} - ] -} diff --git a/wechat/license/var/uos/.license.key b/wechat/license/var/uos/.license.key deleted file mode 100644 index c13b03d..0000000 Binary files a/wechat/license/var/uos/.license.key and /dev/null differ diff --git a/wechat/package.sh b/wechat/package.sh index 3b47c53..d92a941 100755 --- a/wechat/package.sh +++ b/wechat/package.sh @@ -2,10 +2,10 @@ app_name="wechat" tmp_dir="/tmp/${app_name}_tmp" -version="4.0.0.23" -release="${version}-5" +version="4.1.0.13" +release="${version}" -deb_url="https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_${version}_amd64.deb" +deb_url="https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.deb" # 创建临时目录, 用于下载官方包 if [ -d $tmp_dir ]; then rm -rf $tmp_dir @@ -26,17 +26,14 @@ mkdir $tmp_dir echo "创建待打包目录..." mkdir -p "./unpack/DEBIAN" mkdir -p "./unpack/usr/bin" -mkdir -p "./unpack/usr/lib/license" -mkdir -p "./unpack/usr/share/wechat-uos" mkdir -p "./unpack/usr/share/applications" -mkdir -p "./unpack/usr/share/icons" mkdir -p "./unpack/opt/apps" app_dir="./unpack/opt/apps" echo "下载官方原包..." wget $deb_url -O "${tmp_dir}/${app_name}.deb" -# cp ./wechat.deb "${tmp_dir}/${app_name}.deb" +# cp ~/Downloads/WeChatLinux_x86_64.deb "${tmp_dir}/${app_name}.deb" echo "下载完成, 解包中..." @@ -44,25 +41,22 @@ dpkg-deb -R "${tmp_dir}/${app_name}.deb" "${tmp_dir}/${app_name}" echo "解包完成, 复制到待打包目录..." -cp -rv "${tmp_dir}/${app_name}/opt/apps/com.tencent.wechat/files" $app_dir/com.tencent.wechat -cp -rv "${tmp_dir}/${app_name}/opt/apps/com.tencent.wechat/entries/icons/hicolor" "./unpack/usr/share/icons/" +cp -rv "${tmp_dir}/${app_name}/opt/wechat" $app_dir +cp -rv "${tmp_dir}/${app_name}/usr/share/icons" "./unpack/usr/share" +cp -rv "${tmp_dir}/${app_name}/usr/share/doc" "./unpack/usr/share" rm -rf $tmp_dir -# echo "复制uos环境文件..." -cp -rv ./license/etc ./unpack/usr/share/wechat-uos/ -cp -rv ./license/var ./unpack/usr/share/wechat-uos/ -mv -v $app_dir/com.tencent.wechat/libuosdevicea.so ./unpack/usr/lib/license/libuosdevicea.so echo """ #!/bin/bash echo "你在想屁吃~~" exit 1 -""" > $app_dir/com.tencent.wechat/crashpad_handler +""" > $app_dir/wechat/crashpad_handler -chmod +x $app_dir/com.tencent.wechat/crashpad_handler +chmod +x $app_dir/wechat/crashpad_handler -rm -vf $app_dir/com.tencent.wechat/libcrashpad_client.so +rm -vf $app_dir/wechat/libcrashpad_client.so echo "复制完成, 创建可执行文件及程序桌面入口文件..." @@ -71,14 +65,14 @@ echo """ Name=WeChat Name[zh_CN]=微信 Exec=wechat %u -Icon=com.tencent.wechat +Icon=wechat Categories=Utility;Network;InstantMessaging;Chat; Terminal=false Type=Application StartupWMClass=WeChat X-GNOME-SingleWindow=true SingleMainWindow=true -""" > "./unpack/usr/share/applications/com.tencent.wechat.desktop" +""" > "./unpack/usr/share/applications/wechat.desktop" echo """ @@ -108,11 +102,8 @@ fi exec bwrap \\ --dev-bind / / \\ - --ro-bind /usr/share/wechat-uos/var/ /var/ \\ - --ro-bind /usr/share/wechat-uos/etc/os-release /etc/os-release \\ - --ro-bind /usr/share/wechat-uos/etc/lsb-release /etc/lsb-release \\ \${BWRAP_ENV_APPEND} \\ - /opt/apps/com.tencent.wechat/wechat \$@ + /opt/apps/wechat/wechat \$@ """ > ./unpack/usr/bin/wechat