From 1efe4fabe8c3a3e52a382de0e9a772f8e3818a31 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Tue, 19 Jan 2021 23:38:35 +0100 Subject: [PATCH] Fix package creators --- create_linux_gnome_installers.sh | 7 ++++--- create_linux_kde_installers.sh | 8 ++++---- create_linux_minimal_installers.sh | 6 +++--- create_linux_staging_gnome_installers.sh | 13 +++++++------ create_linux_staging_kde_installers.sh | 8 ++++---- create_linux_staging_minimal_installers.sh | 6 +++--- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/create_linux_gnome_installers.sh b/create_linux_gnome_installers.sh index 926ca02..38e61b6 100755 --- a/create_linux_gnome_installers.sh +++ b/create_linux_gnome_installers.sh @@ -68,6 +68,7 @@ OBS_DEB_PKS+="deb10 " OBS_DEB_GNOME_EXT+="v26 " OBS_DEB_ARCHS+="Debian_10/amd64 " OBS_DEB_PKS+="deb10 " +OBS_DEB_GNOME_EXT+="v26 " OBS_DEB_ARCHS+="Debian_Unstable/amd64 " OBS_DEB_PKS+="debunstable " OBS_DEB_GNOME_EXT+="v34 " @@ -164,7 +165,7 @@ create_rpm_tar() { # # Find rpm # - local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^d].*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/") + local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^d].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/") rm -f index.html echo "Found: "${RPM_FILE} @@ -301,7 +302,7 @@ create_deb_tar() { # # Find deb # - local DEB_FILE=$(grep ">${OBS_PACKAGE}_.*\.deb<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*deb\)<.*/\1/") + local DEB_FILE=$(grep ">${OBS_PACKAGE}_${VERSION}.*\.deb<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*deb\)<.*/\1/") rm -f index.html echo "Found: "${DEB_FILE} @@ -398,7 +399,7 @@ create_pac_tar() { # # Find rpm # - local PAC_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*zst\)<.*/\1/") + local PAC_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*zst\)<.*/\1/") rm -f index.html echo "Found: "${PAC_FILE} diff --git a/create_linux_kde_installers.sh b/create_linux_kde_installers.sh index c2f4f88..b1b8849 100755 --- a/create_linux_kde_installers.sh +++ b/create_linux_kde_installers.sh @@ -95,7 +95,7 @@ create_rpm_tar() { # # Find rpm # - local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/") + local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/") rm -f index.html echo "Found: "${RPM_FILE} @@ -218,12 +218,12 @@ create_deb_tar() { # # Find deb # - local DEB_FILE=$(grep ">systray-x_.*\.deb<" index.html | sed -e "s/.*>\(systray-x.*deb\)<.*/\1/") + local DEB_FILE=$(grep ">${OBS_PACKAGE}_${VERSION}.*\.deb<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*deb\)<.*/\1/") rm -f index.html echo "Found: "${DEB_FILE} - FOUND_VERSION=$(echo ${DEB_FILE} | sed -e "s/systray-x_\(.*\)_.*/\1/") + FOUND_VERSION=$(echo ${DEB_FILE} | sed -e "s/${OBS_PACKAGE}_\(.*\)_.*/\1/") echo "Version: "${FOUND_VERSION} @@ -301,7 +301,7 @@ create_pac_tar() { # # Find rpm # - local PAC_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*zst\)<.*/\1/") + local PAC_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*zst\)<.*/\1/") rm -f index.html echo "Found: "${PAC_FILE} diff --git a/create_linux_minimal_installers.sh b/create_linux_minimal_installers.sh index d319b85..f97a090 100755 --- a/create_linux_minimal_installers.sh +++ b/create_linux_minimal_installers.sh @@ -95,7 +95,7 @@ create_rpm_tar() { # # Find rpm # - local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^d].*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/") + local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^d].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/") rm -f index.html echo "Found: "${RPM_FILE} @@ -218,7 +218,7 @@ create_deb_tar() { # # Find deb # - local DEB_FILE=$(grep ">${OBS_PACKAGE}_.*\.deb<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*deb\)<.*/\1/") + local DEB_FILE=$(grep ">${OBS_PACKAGE}_${VERSION}.*\.deb<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*deb\)<.*/\1/") rm -f index.html echo "Found: "${DEB_FILE} @@ -301,7 +301,7 @@ create_pac_tar() { # # Find rpm # - local PAC_FILE=$(grep ">${OBS_PACKAGE}-[^d].*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*zst\)<.*/\1/") + local PAC_FILE=$(grep ">${OBS_PACKAGE}-[^d].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*zst\)<.*/\1/") rm -f index.html echo "Found: "${PAC_FILE} diff --git a/create_linux_staging_gnome_installers.sh b/create_linux_staging_gnome_installers.sh index 4b3f3ba..0504f41 100755 --- a/create_linux_staging_gnome_installers.sh +++ b/create_linux_staging_gnome_installers.sh @@ -68,6 +68,7 @@ OBS_DEB_PKS+="deb10 " OBS_DEB_GNOME_EXT+="v26 " OBS_DEB_ARCHS+="Debian_10/amd64 " OBS_DEB_PKS+="deb10 " +OBS_DEB_GNOME_EXT+="v26 " OBS_DEB_ARCHS+="Debian_Unstable/amd64 " OBS_DEB_PKS+="debunstable " OBS_DEB_GNOME_EXT+="v34 " @@ -117,9 +118,9 @@ create_gnome_extension_tar() { return fi - if [ ${GNOME_EXT} != "v26" ] && - [ ${GNOME_EXT} != "v34" ] && - [ ${GNOME_EXT} != "master" ] ; then + if [ "${GNOME_EXT}" != "v26" ] && + [ "${GNOME_EXT}" != "v34" ] && + [ "${GNOME_EXT}" != "master" ] ; then return fi @@ -164,7 +165,7 @@ create_rpm_tar() { # # Find rpm # - local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^d].*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/") + local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^d].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/") rm -f index.html echo "Found: "${RPM_FILE} @@ -301,7 +302,7 @@ create_deb_tar() { # # Find deb # - local DEB_FILE=$(grep ">${OBS_PACKAGE}_.*\.deb<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*deb\)<.*/\1/") + local DEB_FILE=$(grep ">${OBS_PACKAGE}_${VERSION}.*\.deb<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*deb\)<.*/\1/") rm -f index.html echo "Found: "${DEB_FILE} @@ -398,7 +399,7 @@ create_pac_tar() { # # Find rpm # - local PAC_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*zst\)<.*/\1/") + local PAC_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*zst\)<.*/\1/") rm -f index.html echo "Found: "${PAC_FILE} diff --git a/create_linux_staging_kde_installers.sh b/create_linux_staging_kde_installers.sh index dec1db1..8b4d2a3 100755 --- a/create_linux_staging_kde_installers.sh +++ b/create_linux_staging_kde_installers.sh @@ -95,7 +95,7 @@ create_rpm_tar() { # # Find rpm # - local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/") + local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/") rm -f index.html echo "Found: "${RPM_FILE} @@ -218,12 +218,12 @@ create_deb_tar() { # # Find deb # - local DEB_FILE=$(grep ">systray-x_.*\.deb<" index.html | sed -e "s/.*>\(systray-x.*deb\)<.*/\1/") + local DEB_FILE=$(grep ">${OBS_PACKAGE}_${VERSION}.*\.deb<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*deb\)<.*/\1/") rm -f index.html echo "Found: "${DEB_FILE} - FOUND_VERSION=$(echo ${DEB_FILE} | sed -e "s/systray-x_\(.*\)_.*/\1/") + FOUND_VERSION=$(echo ${DEB_FILE} | sed -e "s/${OBS_PACKAGE}_\(.*\)_.*/\1/") echo "Version: "${FOUND_VERSION} @@ -301,7 +301,7 @@ create_pac_tar() { # # Find rpm # - local PAC_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*zst\)<.*/\1/") + local PAC_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*zst\)<.*/\1/") rm -f index.html echo "Found: "${PAC_FILE} diff --git a/create_linux_staging_minimal_installers.sh b/create_linux_staging_minimal_installers.sh index ac54711..6d83e73 100755 --- a/create_linux_staging_minimal_installers.sh +++ b/create_linux_staging_minimal_installers.sh @@ -95,7 +95,7 @@ create_rpm_tar() { # # Find rpm # - local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^d].*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/") + local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^d].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/") rm -f index.html echo "Found: "${RPM_FILE} @@ -218,7 +218,7 @@ create_deb_tar() { # # Find deb # - local DEB_FILE=$(grep ">${OBS_PACKAGE}_.*\.deb<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*deb\)<.*/\1/") + local DEB_FILE=$(grep ">${OBS_PACKAGE}_${VERSION}.*\.deb<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*deb\)<.*/\1/") rm -f index.html echo "Found: "${DEB_FILE} @@ -301,7 +301,7 @@ create_pac_tar() { # # Find rpm # - local PAC_FILE=$(grep ">${OBS_PACKAGE}-[^d].*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*zst\)<.*/\1/") + local PAC_FILE=$(grep ">${OBS_PACKAGE}-[^d].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*zst\)<.*/\1/") rm -f index.html echo "Found: "${PAC_FILE}