Merge branch 'master' of http://storage3/git/gtk3-classic-build

1 files changed, 11 insertions, 23 deletions

diff --git a/deploy-to-obs.sh b/deploy-to-obs.sh
index 0c5be54..25ef954 100755
--- a/deploy-to-obs.sh
+++ b/deploy-to-obs.sh
@@ -1,42 +1,30 @@
 #!/bin/sh
-# Startdate: 2020-11-04 15:06
+# Startdate: 2023-01-08-1 09:37
 # Purpose: make it a oneliner to get into the OBS
-# History:
-#    2022-09-20 forked for gtk+3.0 gtk3-classic generator
 # Reference:
-#    ublock-origin-combined/deploy-to-obs.sh but heavily modified!
+#    ublock-origin-combined/deploy-to-obs.sh notepadpp d-to-o
 # Dependencies:
 #    osc
 
 devdir=~/dev
-gitdir="${devdir}/gtk+3.0"
+projectdir="${devdir}/gtk3-classic-build"
 obsdir="${devdir}/osc/home:bgstack15:gtk3-classic/gtk3-classic"
-prefix="gtk+3.0"
 
 # Flow
-cd "${gitdir}"
-#"${gitdir}/build-orig-tarball.sh"
-export CLASSIC RAW DEB NO_CLEAN # useful in this next script
-is_x_set="$( set -o | awk '/xtrace/{if($2=="on")print "Y"}' )"
-${is_x_set:+sh -x }"${gitdir}/gtk-classic-build-deb.sh"
-echo "DONE WITH build-orig-tarball"
-tf="$( find . -maxdepth 1 -name "${prefix}"'*orig*z' -printf '%T@ %f\n' | sort -n -k1 | awk '{print $NF}' | tail -n1 )"
-#tar -zxf "${tf}"
-#cd "$( tar -zvtf "${tf}" | awk '/^d/{print $NF}' | head -n1 )"
-#cp -pr "${gitdir}/debian" .
-#debuild -us -uc # depends on dpkg-dev=1.19.7 and not 1.20.5 which is still broken in Ceres as of 2020-11-04
-#test $? -eq 0 || { "debuild failed. Cannot continue. Aborted." ; exit 1 ; }
-cd "${gitdir}"
-dsc_file="$( find . -maxdepth 1 -name "${prefix}"'*dsc' -printf '%T@ %f\n' | sort -n -k1 | awk '{print $NF}' | tail -n1 | cut -d' ' -f2 )"
-debian_tar_file="$( find . -maxdepth 1 -name "${prefix}"'*debian*z' -printf '%T@ %f\n' | sort -n -k1 | awk '{print $NF}' | tail -n1 | cut -d' ' -f2 )"
+cd "${projectdir}"
+"${projectdir}/gtk-classic-build-deb.sh"
+echo "DONE WITH gtk-classic-build-deb"
+tf="$( find . -maxdepth 1 -name 'gtk+3.0_*orig*z' -printf '%T@ %f\n' | sort -n -k1 | awk '{print $NF}' | tail -n1 )"
+dsc_file="$( find . -maxdepth 1 -name 'gtk+3.0_*dsc' -printf '%T@ %f\n' | sort -n -k1 | awk '{print $NF}' | tail -n1 | cut -d' ' -f2 )"
+debian_tar_file="$( find . -maxdepth 1 -name 'gtk+3.0_*debian*z' -printf '%T@ %f\n' | sort -n -k1 | awk '{print $NF}' | tail -n1 | cut -d' ' -f2 )"
 
 # prep obs
 cd "${obsdir}"
 osc up
 osc rm *
-cd "${gitdir}"
+cd "${projectdir}"
 cp -p "${dsc_file}" "${debian_tar_file}" "${tf}" "${obsdir}/"
 cd "${obsdir}"
-#find . -mindepth 1 -maxdepth 1 ! -name "${dsc_file}" ! -name "${debian_tar_file}" ! -name "${tf}" -delete
+find . -mindepth 1 -maxdepth 1 ! -name '.osc' ! -name "${dsc_file}" ! -name "${debian_tar_file}" ! -name "${tf}" -delete
 osc add *
 osc commit # will prompt for commit name