Merge pull request #19 from Samueru-sama/main

Add zsync to appimage
ivan-hc · Aug 11, 2024 · fed1840 · fed1840
2 parents fcbbab2 + c573e7e
commit fed1840
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -14,6 +14,7 @@ jobs:
 
     - name: build
       run: |
+        sudo apt install desktop-file-utils
         APP=steam
         wget -q https://raw.githubusercontent.com/ivan-hc/Conty/master/create-conty.sh
         wget -q https://raw.githubusercontent.com/ivan-hc/Conty/master/conty-start.sh
@@ -23,7 +24,7 @@ jobs:
         mv ./conty.sh tmp/"$APP".AppDir/ || exit 1
         ./"$APP"-conty-builder.sh
         mkdir dist
-        mv *AppImage dist/
+        mv *AppImage* dist/
     - name: Upload artifact
       uses: actions/upload-artifact@v1.0.0
       with:

diff --git a/create-arch-bootstrap.sh b/create-arch-bootstrap.sh
@@ -6,8 +6,7 @@
 ########################################################################
 
 # Package groups
-audio_pkgs="alsa-lib lib32-alsa-lib libpulse \
-	lib32-libpulse jack2 lib32-jack2 pipewire lib32-pipewire"
+audio_pkgs="alsa-lib lib32-alsa-lib libpulse lib32-libpulse pipewire lib32-pipewire"
 
 video_pkgs="mesa lib32-mesa vulkan-radeon lib32-vulkan-radeon vulkan-intel \
 	lib32-vulkan-intel vulkan-icd-loader lib32-vulkan-icd-loader vulkan-mesa-layers \
@@ -379,7 +378,7 @@ run_in_chroot rm -f "${bootstrap}"/etc/locale.conf
 run_in_chroot sed -i 's/LANG=${LANG:-C}/LANG=$LANG/g' /etc/profile.d/locale.sh
 
 # Remove bloatwares
-run_in_chroot pacman --noconfirm -Rsndd gcc
+run_in_chroot pacman --noconfirm -Rsndd gcc yay
 run_in_chroot rm -Rf /usr/include /usr/share/man /usr/share/gtk-doc /usr/lib/gcc /usr/bin/gcc*
 run_in_chroot bash -c 'find "${bootstrap}"/usr/share/doc/* -not -iname "*steam*" -a -not -name "." -delete'
 run_in_chroot bash -c 'find "${bootstrap}"/usr/share/locale/*/*/* -not -iname "*steam*" -a -not -name "." -delete'

diff --git a/steam-conty-builder.sh b/steam-conty-builder.sh
@@ -11,7 +11,7 @@ if test -f ./appimagetool; then
 	echo " appimagetool already exists" 1> /dev/null
 else
 	echo " Downloading appimagetool..."
-	wget -q "$(wget -q https://api.github.com/repos/probonopd/go-appimage/releases -O - | sed 's/"/ /g; s/ /\n/g' | grep -o 'https.*continuous.*tool.*86_64.*mage$')" -O appimagetool
+	wget -q "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -O appimagetool
 fi
 chmod a+x ./appimagetool
 
@@ -334,7 +334,10 @@ fi
 cd .. || exit 1
 
 # EXPORT THE APPDIR TO AN APPIMAGE
-VERSION=$(curl -Ls https://archlinux.org/packages/multilib/x86_64/steam/ | grep steam | head -1 | tr ' ' '\n' | grep "^[0-9]")
-ARCH=x86_64 VERSION="$VERSION-2" ./appimagetool -s ./"$APP".AppDir
-cd .. && mv ./tmp/*.AppImage ./ || exit 1
+export VERSION="$(curl -Ls https://archlinux.org/packages/multilib/x86_64/steam/ | grep steam | head -1 | tr ' ' '\n' | grep "^[0-9]")"
+export ARCH=x86_64
+./appimagetool --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 1 \
+	-u "gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|Steam-appimage|continuous|*x86_64.AppImage.zsync" \
+	./"$APP".AppDir Steam-"$VERSION-3"-"$ARCH".AppImage 
+cd .. && mv ./tmp/*.AppImage* ./ || exit 1