diff --git a/.github/workflows/building-off-line-package-arm.yml b/.github/workflows/building-off-line-package-arm.yml index c8873f8..88c81ca 100644 --- a/.github/workflows/building-off-line-package-arm.yml +++ b/.github/workflows/building-off-line-package-arm.yml @@ -1,16 +1,13 @@ name: Building Wine Runner Off-line Pages(arm64) run-name: ${{ github.actor }} Building Wine Runner Off-line Pages(arm64) 🚀 on: + push: workflow_dispatch: jobs: Explore-GitHub-Actions: runs-on: ubuntu-latest steps: - name: Building DEB - env: - GUSER: ${{ secrets.GUSER }} - PASSWORD: ${{ secrets.PASSWORD }} - UPLOADURL: ${{ secrets.UPLOADURL }} run: | # 获取所需数据 cpu=$(cat /proc/cpuinfo | grep processor | wc -l) @@ -44,10 +41,12 @@ jobs: mv deep-wine-runner/spark-deepin-wine-runner.deb debian/tmp/wine-runner.deb ## 安装 sudo chroot debian apt install locales /tmp/wine-runner.deb fcitx xfce4-terminal -y + sudo chroot debian apt install libxenmisc4.17 libxenstore4 libxenforeignmemory1 -y # 构建软件包 mkdir package/runner -p sudo cp debian/usr/bin package -rv sudo cp debian/usr/lib package -rv + sudo cp debian/usr/share package -rv #sudo cp debian/usr/lib64 package -rv sudo cp debian/opt/apps/deepin-wine-runner/* package/runner -rv cp deep-wine-runner/off-line-shell/run.sh package -rv diff --git a/.github/workflows/building-off-line-package.yml b/.github/workflows/building-off-line-package.yml index 4e5a938..f058573 100644 --- a/.github/workflows/building-off-line-package.yml +++ b/.github/workflows/building-off-line-package.yml @@ -1,16 +1,13 @@ name: Building Wine Runner Off-line Pages(amd64) run-name: ${{ github.actor }} Building Wine Runner Off-line Pages(amd64) 🚀 on: + push: workflow_dispatch: jobs: Explore-GitHub-Actions: runs-on: ubuntu-latest steps: - name: Building DEB - env: - GUSER: ${{ secrets.GUSER }} - PASSWORD: ${{ secrets.PASSWORD }} - UPLOADURL: ${{ secrets.UPLOADURL }} run: | # 获取所需数据 cpu=$(cat /proc/cpuinfo | grep processor | wc -l) @@ -44,10 +41,12 @@ jobs: mv deep-wine-runner/spark-deepin-wine-runner.deb debian/tmp/wine-runner.deb ## 安装 sudo chroot debian apt install locales /tmp/wine-runner.deb winehq-devel fcitx xfce4-terminal -y + sudo chroot debian apt install libxenmisc4.17 libxenstore4 libxenforeignmemory1 -y # 构建软件包 mkdir package/runner -p sudo cp debian/usr/bin package -rv sudo cp debian/usr/lib package -rv + sudo cp debian/usr/share package -rv sudo cp debian/usr/lib64 package -rv sudo cp debian/opt/apps/deepin-wine-runner/* package/runner -rv cp deep-wine-runner/off-line-shell/run.sh package -rv diff --git a/off-line-shell/run.sh b/off-line-shell/run.sh index e9d0eb9..2d41c49 100755 --- a/off-line-shell/run.sh +++ b/off-line-shell/run.sh @@ -3,17 +3,18 @@ SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) # /opt 目录识别 option="" -if [[ -d /usr/lib32 ]]; then - option="$option --dev-bind \"$SHELL_FOLDER/lib32\" /usr/lib32 " +if [[ -d /usr/lib32 ]] && [[ -d $SHELL_FOLDER/lib32 ]]; then + option="$option --dev-bind $SHELL_FOLDER/lib32 /usr/lib32 " fi -if [[ -d /usr/lib64 ]]; then - option="$option --dev-bind \"$SHELL_FOLDER/lib64\" /usr/lib64 " +if [[ -d /usr/lib64 ]] && [[ -d $SHELL_FOLDER/lib64 ]]; then + option="$option --dev-bind $SHELL_FOLDER/lib64 /usr/lib64 " fi "$SHELL_FOLDER/bwrap" --dev-bind / / \ --dev-bind "$SHELL_FOLDER/bin" /usr/bin \ --dev-bind "$SHELL_FOLDER/lib" /usr/lib \ --dev-bind /usr/lib/locale /usr/lib/locale \ + --dev-bind "$SHELL_FOLDER/share" /usr/share \ $option \ $SHELL_FOLDER/runner/deepin-wine-runner $*