diff --git a/.SRCINFO b/.SRCINFO index 0ae2226..82451a0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = open-video-downloader-appimage pkgdesc = A cross-platform GUI for youtube-dl made in Rust with Tauri and Vue + Typescript pkgver = 3.2.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/jely2002/youtube-dl-gui arch = x86_64 license = AGPL3 @@ -13,7 +13,7 @@ pkgbase = open-video-downloader-appimage source = open-video-downloader.desktop source = open-video-downloader.png sha256sums = dffee4cfef50e8edb9be4136d5650b123e49b8a1ffd959ff3d2c42502fc391e3 - sha256sums = 217d02211a51853d920e53558cd9cbd7a753ba9f2036ddaa0ec4e00a77351b6c + sha256sums = c9e49f87d6d146252a58f5de8b5451b021119c4698805228078d70d1f609d5d9 sha256sums = 188992cbe106d0dd6e7b9c219020118a1246c3657c828f86e463617c3d6214cb pkgname = open-video-downloader-appimage diff --git a/PKGBUILD b/PKGBUILD index dc9e5e9..d82b356 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ _srcmntr="jely2002" pkgname="${_pkgname}-appimage" pkgver="3.2.0" -pkgrel="1" +pkgrel="2" pkgdesc="A cross-platform GUI for youtube-dl made in Rust with Tauri and Vue + Typescript" url="https://github.com/${_srcmntr}/${_srcname}" arch=("x86_64") @@ -23,7 +23,7 @@ provides=("open-video-downloader") sha256sums=( "dffee4cfef50e8edb9be4136d5650b123e49b8a1ffd959ff3d2c42502fc391e3" - "217d02211a51853d920e53558cd9cbd7a753ba9f2036ddaa0ec4e00a77351b6c" + "c9e49f87d6d146252a58f5de8b5451b021119c4698805228078d70d1f609d5d9" "188992cbe106d0dd6e7b9c219020118a1246c3657c828f86e463617c3d6214cb" ) diff --git a/open-video-downloader.desktop b/open-video-downloader.desktop index 01fab73..17613ec 100644 --- a/open-video-downloader.desktop +++ b/open-video-downloader.desktop @@ -1,13 +1,9 @@ [Desktop Entry] Categories= Comment=Download videos from all over the web. -Exec=open-video-downloader +Exec=reflex %U StartupWMClass=open-video-downloader Icon=open-video-downloader Name=Open Video Downloader Terminal=false Type=Application - -X-AppImage-Name=Open_Video_Downloader -X-AppImage-Version=UNKNOWN -X-AppImage-Arch=x86_64 diff --git a/push.sh b/push.sh index ac89e6a..988c0fe 100755 --- a/push.sh +++ b/push.sh @@ -17,7 +17,7 @@ fi # Check version if [ "${pkgver}" = "${oldver}" ] && [ -z "${FORCE_REBUILD}" ]; then echo >/dev/stderr "Error: same (old) version specified - update aborted" - exit 1 + exit fi # Get variables from PKGBUILD @@ -38,27 +38,26 @@ else fi # Perform variable substitution -url="${url//\$\{pkgname\}/$pkgname}" url="${url//\$\{_pkgname\}/$_pkgname}" url="${url//\$\{_srcname\}/$_srcname}" url="${url//\$\{_srcmntr\}/$_srcmntr}" url="${url//\$\{pkgver\}/$pkgver}" -_archive="${_archive//\$\{pkgname\}/$pkgname}" _archive="${_archive//\$\{_pkgname\}/$_pkgname}" _archive="${_archive//\$\{pkgver\}/$pkgver}" aur_url="${aur_url//\$\{_pkgname\}/$_pkgname}" +pkgname="${pkgname//\$\{_pkgname\}/$_pkgname}" # Download archive -wget -O ${_archive} "${url}" +wget -qO ${_archive} "${url}" # Extract icon / .desktop files if appimage if printf '%s' "${_archive,,}" | grep -qi "appimage"; then chmod +x "${_archive}" - "./${_archive}" --appimage-extract + "./${_archive}" --appimage-extract >/dev/null cp "squashfs-root/${desktop}" "${newdesktop}" cp "squashfs-root/${icon}" "${newicon}" - if [ -L "squashfs-root" ]; then - rm -rf $(readlink -f squashfs-root) squashfs-root - fi + sed -i '/^X-AppImage-/d;/^$/d' "${newdesktop}" + sed -i 's/^Exec=.*/Exec=reflex %U/' "${newdesktop}" + rm -rf $(readlink -f squashfs-root) squashfs-root fi # Calculate checksums sha256bin=$(sha256sum ${_archive} | awk '{print $1}') @@ -81,6 +80,9 @@ sha256sums=(\ 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 @@ -94,7 +96,7 @@ fi if [ -z "${NO_GIT_PUSH}" ]; then # In case of fire, git commit, git push, leave building git add . - git commit -m "Updated ${pkgname} to ${pkgver}-${pkgrel}" + git commit -m "${commit_msg}" git remote add aur ${aur_url} git push origin main git push aur main:master