Split release script

mbuesch · Mar 18, 2024 · 781893a · 781893a
1 parent 661b392
commit 781893a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 15 deletions.
diff --git a/maintenance/makerelease-disktest-lib.sh b/maintenance/makerelease-disktest-lib.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+srcdir="$(realpath "$0" | xargs dirname)"
+srcdir="$srcdir/.."
+
+# Import the makerelease.lib
+# https://bues.ch/cgit/misc.git/tree/makerelease.lib
+die() { echo "$*"; exit 1; }
+for path in $(echo "$PATH" | tr ':' ' '); do
+	[ -f "$MAKERELEASE_LIB" ] && break
+	MAKERELEASE_LIB="$path/makerelease.lib"
+done
+[ -f "$MAKERELEASE_LIB" ] && . "$MAKERELEASE_LIB" || die "makerelease.lib not found."
+
+project=disktest-lib
+conf_package=disktest-lib
+makerelease "$@"
diff --git a/maintenance/makerelease.sh → maintenance/makerelease-disktest-rawio.sh b/maintenance/makerelease.sh → maintenance/makerelease-disktest-rawio.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-srcdir="$(realpath -e "$0" | xargs dirname)"
+srcdir="$(realpath "$0" | xargs dirname)"
 srcdir="$srcdir/.."
 
 # Import the makerelease.lib
@@ -10,21 +10,8 @@ for path in $(echo "$PATH" | tr ':' ' '); do
 	[ -f "$MAKERELEASE_LIB" ] && break
 	MAKERELEASE_LIB="$path/makerelease.lib"
 done
-
 [ -f "$MAKERELEASE_LIB" ] && . "$MAKERELEASE_LIB" || die "makerelease.lib not found."
+
 project=disktest-rawio
 conf_package=disktest-rawio
-conf_notag=1
-makerelease "$@"
-
-[ -f "$MAKERELEASE_LIB" ] && . "$MAKERELEASE_LIB" || die "makerelease.lib not found."
-project=disktest-lib
-conf_package=disktest-lib
-conf_notag=1
-makerelease "$@"
-
-[ -f "$MAKERELEASE_LIB" ] && . "$MAKERELEASE_LIB" || die "makerelease.lib not found."
-project=disktest
-conf_package=disktest
-conf_notag=0
 makerelease "$@"
diff --git a/maintenance/makerelease-disktest.sh b/maintenance/makerelease-disktest.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+srcdir="$(realpath "$0" | xargs dirname)"
+srcdir="$srcdir/.."
+
+# Import the makerelease.lib
+# https://bues.ch/cgit/misc.git/tree/makerelease.lib
+die() { echo "$*"; exit 1; }
+for path in $(echo "$PATH" | tr ':' ' '); do
+	[ -f "$MAKERELEASE_LIB" ] && break
+	MAKERELEASE_LIB="$path/makerelease.lib"
+done
+[ -f "$MAKERELEASE_LIB" ] && . "$MAKERELEASE_LIB" || die "makerelease.lib not found."
+
+project=disktest
+conf_package=disktest
+makerelease "$@"