diff --git a/Makefile b/Makefile index 24ca318..f1b9415 100755 --- a/Makefile +++ b/Makefile @@ -8,8 +8,6 @@ clean: rm -rfv VM-source/.qmake.stash package: - # 读取程序版本号 - PROGRAMVERSION=`python3 GetProgramVersion.py` #cd VM-source && qmake #cd VM-source && make #cd wine && make @@ -129,9 +127,6 @@ package: python3 RemovePycacheFile.py sudo rm -rfv /tmp/spark-deepin-wine-runner-builder/ cp -rv deb /tmp/spark-deepin-wine-runner-builder - sed -i "s%@@VERSION@@%${PROGRAMVERSION}%g" /tmp/spark-deepin-wine-runner-builder/DEBIAN/control - SIZE=`du /tmp/spark-deepin-wine-runner-builder/` - sed -i "s%@@SIZE@@%${SIZE}%g" /tmp/spark-deepin-wine-runner-builder/DEBIAN/control rm -rfv deb/opt/apps/deepin-wine-runner/* rm -rfv package-script.zip mkdir -pv /tmp/spark-deepin-wine-runner-builder/usr/bin @@ -154,7 +149,7 @@ package: ln -s /opt/apps/deepin-wine-runner/InstallNetFramework.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-wine-netframework-installer ln -s /opt/apps/deepin-wine-runner/InstallVisualCPlusPlus.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-wine-vscppruntime-installer ln -s /opt/apps/deepin-wine-runner/deepin-wine-venturi-setter.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-venturi-setter - + bash builddeb/ChangeDebVersion.sh sudo chown -R root:root /tmp/spark-deepin-wine-runner-builder dpkg-deb -Z xz -z 9 -b /tmp/spark-deepin-wine-runner-builder spark-deepin-wine-runner.deb @@ -162,9 +157,7 @@ package: # 构建 ace 包 cp -rv deb-ace /tmp/spark-deepin-wine-runner-builder cp -rv spark-deepin-wine-runner.deb /tmp/spark-deepin-wine-runner-builder/opt/apps/spark-deepin-wine-runner-ace - sed -i "s%@@VERSION@@%${PROGRAMVERSION}%g" /tmp/spark-deepin-wine-runner-builder/DEBIAN/control - SIZE=`du /tmp/spark-deepin-wine-runner-builder/` - sed -i "s%@@SIZE@@%${SIZE}%g" /tmp/spark-deepin-wine-runner-builder/DEBIAN/control + bash builddeb/ChangeDebVersion.sh sudo chown -R root:root /tmp/spark-deepin-wine-runner-builder dpkg-deb -Z xz -z 9 -b /tmp/spark-deepin-wine-runner-builder spark-deepin-wine-runner-ace.deb sudo rm -rfv /tmp/spark-deepin-wine-runner-builder diff --git a/builddeb/ChangeDebVersion.sh b/builddeb/ChangeDebVersion.sh new file mode 100644 index 0000000..6ce758d --- /dev/null +++ b/builddeb/ChangeDebVersion.sh @@ -0,0 +1,7 @@ +#!/bin/bash +# 读取程序版本号 +cd `dirname $0` +export PROGRAMVERSION=`python3 GetProgramVersion.py` +export SIZE=`du /tmp/spark-deepin-wine-runner-builder/ | tail -n1 | awk '{print $1}'` +sed -i "s%@@VERSION@@%$PROGRAMVERSION%g" /tmp/spark-deepin-wine-runner-builder/DEBIAN/control +sed -i "s%@@SIZE@@%$SIZE%g" /tmp/spark-deepin-wine-runner-builder/DEBIAN/control \ No newline at end of file diff --git a/builddeb/GetProgramVersion.py b/builddeb/GetProgramVersion.py new file mode 100755 index 0000000..fd901f1 --- /dev/null +++ b/builddeb/GetProgramVersion.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python3 +# 读取程序版本号 +import os +import json +programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string +try: + with open(f"{programPath}/../information.json") as file: + print(json.loads(file.read())["Version"]) +except: + print("1.0.0") \ No newline at end of file diff --git a/deb-ace/DEBIAN/postinst b/deb-ace/DEBIAN/postinst index c92689b..52ff163 100755 --- a/deb-ace/DEBIAN/postinst +++ b/deb-ace/DEBIAN/postinst @@ -32,6 +32,6 @@ notify-send "Installing Wine Runner BCM, may cost some time please ensure your n notify-send "正在书虫兼容环境中安装 Wine 运行器,可能会花费一些时间,请保持网络畅通" bookworm-run aptss update cp /opt/apps/spark-deepin-wine-runner-ace/spark-deepin-wine-runner.deb /tmp -bookworm-run aptss install /tmp/spark-deepin-wine-runner.deb -y +bookworm-run aptss reinstall /tmp/spark-deepin-wine-runner.deb -y bookworm-run aptss clean