enable support of -1 tags in gtk3classic upstream repo

2 files changed, 7 insertions, 2 deletions

diff --git a/get-latest-versions.sh b/get-latest-versions.sh
index ad1ba19..62c14d8 100755
--- a/get-latest-versions.sh
+++ b/get-latest-versions.sh
@@ -3,7 +3,7 @@ oldx="$( printf %s\\n "$-" | grep -q -e 'x' && echo YES )"
 set +x # hide this cruft
 test -z "${WORKDIR}" && WORKDIR="$( readlink -f . )"
 export WORKDIR
-RAW_DEB="$( rmadison gtk+3.0 | awk --field-separator='|' '{gsub(" ","");print $2,$2,$3}' | awk '{gsub("-[0-9]+","",$1);print}' | sort -r --sort=version | grep -v debug | head -n1)"
+RAW_DEB="$( rmadison gtk+3.0 | awk -F='|' '{gsub(" ","");print $2,$2,$3}' | awk '{gsub("-[0-9]+","",$1);print}' | sort -r --sort=version | grep -v debug | head -n1)"
 RAW="$( echo "${RAW_DEB}" | awk '{print $1}' )"
 DEB="$( echo "${RAW_DEB}" | awk '{print $2}' )"
 if ! test "$( cd "${WORKDIR}/gtk3classic" 2>/dev/null && git remote -v | grep -o 'origin	https://github.com/lah7/gtk3-classic' | head -n1 )" = "origin	https://github.com/lah7/gtk3-classic" ; then
diff --git a/gtk-classic-build-deb.sh b/gtk-classic-build-deb.sh
index b79c904..ed9ff3a 100755
--- a/gtk-classic-build-deb.sh
+++ b/gtk-classic-build-deb.sh
@@ -8,6 +8,7 @@
 # Purpose: combine gtk+3.0 from debian and gtk3-classic into a .deb suite for Devuan Ceres
 # History:
 #    2023-01-11 switch package release to stackrpms
+#    2023-08-19 support gtk3-classic upstream
 # Usage:
 #    make
 # References:
@@ -54,7 +55,7 @@ else
    echo "${classic_vers}" > "${WORKDIR}/classic_vers"
 
    #### Find versions of gtk+3.0 available to debian
-   debian_vers="$( rmadison gtk+3.0 | awk --field-separator='|' '{gsub(" ","");print $2,$2,$3}' | awk '{gsub("-[0-9]+","",$1);print}' | sort -r --sort=version | grep -v debug )"
+   debian_vers="$( rmadison gtk+3.0 | awk -F='|' '{gsub(" ","");print $2,$2,$3}' | awk '{gsub("-[0-9]+","",$1);print}' | sort -r --sort=version | grep -v debug )"
    echo "${debian_vers}" > "${WORKDIR}/debian_vers"
 
    #### Find highest matching version
@@ -63,9 +64,13 @@ else
    raw_version="$( echo "${highest_ver}" | awk '{print $1}' )"
    deb_version="$( echo "${highest_ver}" | awk '{print $2}' )"
    classic_version="${raw_version}"
+   # so now check if there are "3.24.38-4" dash number version tags in the classic repo. This is bad form, but who am I to correct such venerable people?
+   highest_raw_sub_version="$( grep -e "^${raw_version}" "${WORKDIR}/classic_vers" | head -n1 )"
+   classic_version="${highest_raw_sub_version}"
 
    # and $3 is the distro name like "experimental" which is not needed.
    echo "Found highest version: ${highest_ver}"
+   echo "and will use highest classic sub-version ${highest_raw_sub_version}"
 fi
 
 #### Fetch debian sources