v1.6.0 changes

Author: ferion11

deployscript/archlinux-pcsx2-deploy.sh

@@ -159,24 +159,25 @@ BEGIN {
 EOF
 chmod +x git-describe-remote.sh
 
-FULL=$(./git-describe-remote.sh https://github.com/PCSX2/pcsx2)
+#FULL=$(./git-describe-remote.sh https://github.com/PCSX2/pcsx2)
 
-VERSION=$(echo $FULL | cut -d- -f1)
-TYPE=$(echo $FULL | cut -d- -f2)
-RELEASE=$(echo $FULL | cut -d- -f3)
-GITHASH=$(echo $FULL | cut -d- -f4)
+#VERSION=$(echo $FULL | cut -d- -f1)
+VERSION="1.6.0"
+#TYPE=$(echo $FULL | cut -d- -f2)
+#RELEASE=$(echo $FULL | cut -d- -f3)
+#GITHASH=$(echo $FULL | cut -d- -f4)
 
 #ARCHV=$(echo $FULL | sed 's/^v//; s/-dev//; s/-/.r/; s/-g/./')
 #ARCHV=$(echo $FULL | sed 's/^v//; s/-rc//; s/-/.r/; s/-g/./')
-ARCHV=$(echo $FULL | sed "s/^v//; s/-$TYPE//; s/-/.r/; s/-g/./")
+#ARCHV=$(echo $FULL | sed "s/^v//; s/-$TYPE//; s/-/.r/; s/-g/./")
 
 echo "=== VERSIONS ==="
-echo "FULL: $FULL"
-echo "ARCHV: $ARCHV"
+#echo "FULL: $FULL"
+#echo "ARCHV: $ARCHV"
 echo "VERSION: $VERSION"
-echo "TYPE: $TYPE"
-echo "RELEASE: $RELEASE"
-echo "GITHASH: $GITHASH"
+#echo "TYPE: $TYPE"
+#echo "RELEASE: $RELEASE"
+#echo "GITHASH: $GITHASH"
 
 rm -rf git-describe-remote.sh
 #===========================================================================================
@@ -243,8 +244,8 @@ sudo -u nobody cat > "./pcsx2-git/PKGBUILD" << EOF
 # Contributor: josephgbr <[email protected]>
 # Contributor: Themaister <[email protected]>
 
-pkgname=pcsx2-git
-pkgver=$ARCHV
+pkgname=pcsx2-$VERSION
+pkgver=$VERSION
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -276,7 +277,7 @@ makedepends=(
 )
 provides=(pcsx2)
 conflicts=(pcsx2)
-source=(git+https://github.com/PCSX2/pcsx2.git)
+source=(git+https://github.com/PCSX2/pcsx2.git#branch=1.6.x)
 sha256sums=(SKIP)
 
 pkgver() {
@@ -542,16 +543,16 @@ cd ..
 # AppImage generation:
 ./appimagetool.AppImage --appimage-extract
 
-export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-*arch*.AppImage.zsync' pcsx2-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-${ARCH}.AppImage
-export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_NVIDIA_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2_NVIDIA-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-*arch*.AppImage.zsync' pcsx2_NVIDIA-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-${ARCH}.AppImage
-export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_NVIDIA_390xx_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2_NVIDIA390xx-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-*arch*.AppImage.zsync' pcsx2_NVIDIA390xx-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-${ARCH}.AppImage
-export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_NVIDIA_340xx_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2_NVIDIA340xx-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-*arch*.AppImage.zsync' pcsx2_NVIDIA340xx-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-${ARCH}.AppImage
+#export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-*arch*.AppImage.zsync' pcsx2-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-${ARCH}.AppImage
+#export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_NVIDIA_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2_NVIDIA-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-*arch*.AppImage.zsync' pcsx2_NVIDIA-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-${ARCH}.AppImage
+#export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_NVIDIA_390xx_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2_NVIDIA390xx-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-*arch*.AppImage.zsync' pcsx2_NVIDIA390xx-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-${ARCH}.AppImage
+#export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_NVIDIA_340xx_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2_NVIDIA340xx-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-*arch*.AppImage.zsync' pcsx2_NVIDIA340xx-${VERSION}-${TYPE}-${RELEASE}-${GITHASH}-${ARCH}.AppImage
 
-## tmp name:
-#export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2-${VERSION}-${TYPE}-*arch*.AppImage.zsync' pcsx2-${VERSION}-${TYPE}-${ARCH}.AppImage
-#export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_NVIDIA_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2_NVIDIA-${VERSION}-${TYPE}-*arch*.AppImage.zsync' pcsx2_NVIDIA-${VERSION}-${TYPE}-${ARCH}.AppImage
-#export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_NVIDIA_390xx_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2_NVIDIA390xx-${VERSION}-${TYPE}-*arch*.AppImage.zsync' pcsx2_NVIDIA390xx-${VERSION}-${TYPE}-${ARCH}.AppImage
-#export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_NVIDIA_340xx_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2_NVIDIA340xx-${VERSION}-${TYPE}-*arch*.AppImage.zsync' pcsx2_NVIDIA340xx-${VERSION}-${TYPE}-${ARCH}.AppImage
+# 1.6.x name:
+export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2-${VERSION}-*arch*.AppImage.zsync' pcsx2-${VERSION}-${ARCH}.AppImage
+export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_NVIDIA_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2_NVIDIA-${VERSION}-*arch*.AppImage.zsync' pcsx2_NVIDIA-${VERSION}-${ARCH}.AppImage
+export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_NVIDIA_390xx_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2_NVIDIA390xx-${VERSION}-*arch*.AppImage.zsync' pcsx2_NVIDIA390xx-${VERSION}-${ARCH}.AppImage
+export ARCH=x86_64; squashfs-root/AppRun -v $PCSX2_NVIDIA_340xx_WORKDIR -u 'gh-releases-zsync|ferion11|pcsx2_Appimage|continuous|pcsx2_NVIDIA340xx-${VERSION}-*arch*.AppImage.zsync' pcsx2_NVIDIA340xx-${VERSION}-${ARCH}.AppImage
 
 
 echo "Packing tar result file..."