Updated pman to 1.2.0-3

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = pman-helper
 	pkgdesc = A pacman helper script, because you forget all the stupid flags
-	pkgver = 1.4.0
+	pkgver = 1.2.0
 	pkgrel = 3
 	url = https://git.bjphoster.com/source/pman
 	arch = any
@@ -8,9 +8,9 @@ pkgbase = pman-helper
 	depends = bash
 	depends = pacman
 	conflicts = pman
-	source = https://git.bjphoster.com/source/pman/archive/1.4.0.tar.gz
+	source = https://git.bjphoster.com/source/pman/archive/1.2.0.tar.gz
-	md5sums = 235271ded1d7bfa950347954169d0ee6
+	md5sums = 5b424b1b6900b4f8cdcd8a5388be55aa
-	sha1sums = 5cd50a98e40cf26b887cc93bf4919b5278d3218a
+	sha1sums = df1f0c0d476619fa6994c72c94f0fd50e08fa74c
-	sha256sums = 0026ab2d951c224c8b7bac3b4e89c9997c8b58a8cfcd5ed59a8133a42c8688af
+	sha256sums = 400980f9d8e4d8df3f95cf8c7430922586ba389289a80d0ba18d127f095d1d84
 
 pkgname = pman-helper

PKGBUILD

@@ -2,7 +2,7 @@
 
 _pkgname="pman"
 pkgname="${_pkgname}-helper"
-pkgver="1.4.0"
+pkgver="1.2.0"
 pkgrel="3"
 pkgdesc="A pacman helper script, because you forget all the stupid flags"
 url="https://git.bjphoster.com/source/${_pkgname}"
@@ -12,9 +12,9 @@ depends=("bash" "pacman")
 conflicts=("pman") # Another package called `pman` currently exists in the AUR
 source=("https://git.bjphoster.com/source/${_pkgname}/archive/${pkgver}.tar.gz")
 
-sha1sums=("5cd50a98e40cf26b887cc93bf4919b5278d3218a")
+sha1sums=("df1f0c0d476619fa6994c72c94f0fd50e08fa74c")
-sha256sums=("0026ab2d951c224c8b7bac3b4e89c9997c8b58a8cfcd5ed59a8133a42c8688af")
+sha256sums=("400980f9d8e4d8df3f95cf8c7430922586ba389289a80d0ba18d127f095d1d84")
-md5sums=("235271ded1d7bfa950347954169d0ee6")
+md5sums=("5b424b1b6900b4f8cdcd8a5388be55aa")
 
 package() {
   install -Dm644 "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

push.sh

@@ -1,103 +1,50 @@
 #!/usr/bin/env bash
 
-# Variables
-gui=false
-desktop="pman.desktop"
-icon="pman.png"
-
 # Get version
-oldver=$(grep -E "^pkgver=" PKGBUILD | sed 's/pkgver="//;s/"//')
+oldver=$(grep "pkgver=" PKGBUILD | sed 's/pkgver="//;s/"//')
 if [ $# -eq 1 ]; then
   pkgver="${1}"
 else
   echo "Old version: ${oldver}"
   read -p "New version: " pkgver
 fi
-
 # Check version
-if [ "${pkgver}" = "${oldver}" ] && [ -z "${FORCE_REBUILD}" ]; then
+if [ "${pkgver}" = "${oldver}" ]; then
   echo >/dev/stderr "Error: same (old) version specified - update aborted"
-  exit
+  exit 1
 fi
 
 # Get variables from PKGBUILD
-url=$(sed -n '/^source=(/,/)/p' PKGBUILD | grep -oE 'https?://[^"]+')
+url=$(grep "source=" PKGBUILD | sed 's/source=("//;s/")//')
-pkgname=$(grep -E "^pkgname=" PKGBUILD | sed 's/pkgname="//;s/"//')
+pkgname=$(grep "_pkgname=" PKGBUILD | sed 's/_pkgname="//;s/"//')
-_pkgname=$(grep -E "^_pkgname=" PKGBUILD | sed 's/_pkgname="//;s/"//')
+pkgrel=$(grep "pkgrel=" PKGBUILD | sed 's/pkgrel="//;s/"//')
-_srcname=$(grep -E "^_srcname=" PKGBUILD | sed 's/_srcname="//;s/"//')
+aur_url=$(grep "pkgname=" PKGBUILD | tail -n 1 | sed 's/pkgname="//;s/"//')
-_srcmntr=$(grep -E "^_srcmntr=" PKGBUILD | sed 's/_srcmntr="//;s/"//')
-_archive=$(grep -E "^_archive=" PKGBUILD | sed 's/_archive="//;s/"//')
-pkgrel=$(grep -E "^pkgrel=" PKGBUILD | sed 's/pkgrel="//;s/"//')
-aur_url="ssh://aur@aur.archlinux.org/${pkgname}.git"
-if [ "${gui}" = "true" ] && [ -n "${_pkgname}" ]; then
-  newdesktop="${_pkgname}.desktop"
-  newicon="${_pkgname}.png"
-else
-  newdesktop="${package}.desktop"
-  newicon="${package}.png"
-fi
-
 # Perform variable substitution
-url="${url//\$\{_pkgname\}/$_pkgname}"
+archive_url="${url//\$\{_pkgname\}/$pkgname}"
-url="${url//\$\{_srcname\}/$_srcname}"
+archive_url="${archive_url//\$\{pkgver\}/$pkgver}"
-url="${url//\$\{_srcmntr\}/$_srcmntr}"
+aur_url="ssh://aur@aur.archlinux.org/${aur_url//\$\{_pkgname\}/$pkgname}.git"
-url="${url//\$\{pkgver\}/$pkgver}"
-_archive="${_archive//\$\{_pkgname\}/$_pkgname}"
-_archive="${_archive//\$\{pkgver\}/$pkgver}"
-aur_url="${aur_url//\$\{_pkgname\}/$_pkgname}"
-pkgname="${pkgname//\$\{_pkgname\}/$_pkgname}"
 
 # Download archive
-wget -qO ${_archive} "${url}"
+wget -O ${pkgname}.tar.gz "${archive_url}"
-# Extract icon / .desktop files if appimage
-if printf '%s' "${_archive,,}" | grep -qi "appimage"; then
-  chmod +x "${_archive}"
-  "./${_archive}" --appimage-extract >/dev/null
-  cp "squashfs-root/${desktop}" "${newdesktop}"
-  cp "squashfs-root/${icon}" "${newicon}"
-  sed -i "/^X-AppImage-/d;/^$/d" "${newdesktop}"
-  sed -i "s/^Exec=.*/Exec=${_pkgname} %U/" "${newdesktop}"
-  rm -rf $(readlink -f squashfs-root) squashfs-root
-fi
 # Calculate checksums
-sha256bin=$(sha256sum ${_archive} | awk '{print $1}')
+sha1sum=$(sha1sum ${pkgname}.tar.gz | awk '{print $1}')
-if [ "${gui}" = "true" ]; then
+sha256sum=$(sha256sum ${pkgname}.tar.gz | awk '{print $1}')
-  sha256dsk=$(sha256sum ${newdesktop} | awk '{print $1}')
+md5sum=$(md5sum ${pkgname}.tar.gz | awk '{print $1}')
-  sha256ico=$(sha256sum ${newicon} | awk '{print $1}')
-fi
 # Yoink the archive - unnecessary anymore
-rm -f ${_archive}
+rm -f ${pkgname}.tar.gz
 
 # Update PKGBUILD with new values
 sed -i -E "s/^pkgver=\"[^\"]+\"/pkgver=\"$pkgver\"/" PKGBUILD
-if [ "${gui}" = "true" ]; then
+sed -i -E "s/^sha1sums=\(\"[^\"]+\"\)/sha1sums=(\"$sha1sum\")/" PKGBUILD
-  sed -i '/^sha256sums=(/,/^)/c\
+sed -i -E "s/^sha256sums=\(\"[^\"]+\"\)/sha256sums=(\"$sha256sum\")/" PKGBUILD
-sha256sums=(\
+sed -i -E "s/^md5sums=\(\"[^\"]+\"\)/md5sums=(\"$md5sum\")/" PKGBUILD
-  "'"$sha256bin"'"\
+
-  "'"$sha256dsk"'"\
-  "'"$sha256ico"'"\
-)' PKGBUILD
-else
-  sed -i -E "s/^sha256sums=\(\"[^\"]+\"\)/sha256sums=(\"$sha256bin\")/" PKGBUILD
-fi
-if [ "${pkgver}" != "${oldver}" ] && [ -n "${FORCE_REBUILD}" ]; then
-  sed -i -E "s/^pkgrel=\"[^\"]+\"/pkgrel=\"1\"/" PKGBUILD
-fi
 # Update .SRCINFO
 makepkg --printsrcinfo > .SRCINFO
 
-# Create git message with correct variable
+# In case of fire, git commit, git push, leave building
-if [ -n "$_pkgname" ]; then
+git add .
-  commit_msg="Updated ${pkgname//\$\{_pkgname\}/_pkgname} to ${pkgver}-${pkgrel}"
+git commit -m "Updated ${pkgname} to ${pkgver}-${pkgrel}"
-else
+git remote add aur ${aur_url}
-  commit_msg="Updated ${pkgname} to ${pkgver}-${pkgrel}"
+git push origin main
-fi
+git push aur main:master
-
-if [ -z "${NO_GIT_PUSH}" ]; then
-  # In case of fire, git commit, git push, leave building
-  git add .
-  git commit -m "${commit_msg}"
-  git remote add aur ${aur_url}
-  git push origin main
-  git push aur main:master
-fi