summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2019-06-04 00:31:45 -0400
committerMax Rees <maxcrees@me.com>2020-03-07 17:34:10 -0600
commitbed5c444f37fc4e0558af45c1d82005b331d4b0e (patch)
treea301e6da045942d85ac78638709a4609612e3cba
parent54d6a4a10318f06ba10d28ab8ac8290f81cb6970 (diff)
downloadabuild-bed5c444f37fc4e0558af45c1d82005b331d4b0e.tar.gz
abuild-bed5c444f37fc4e0558af45c1d82005b331d4b0e.tar.bz2
abuild-bed5c444f37fc4e0558af45c1d82005b331d4b0e.tar.xz
abuild-bed5c444f37fc4e0558af45c1d82005b331d4b0e.zip
abump, apkgrel: ensure git is maybe installed first
-rw-r--r--abump.in1
-rw-r--r--apkgrel.in1
2 files changed, 2 insertions, 0 deletions
diff --git a/abump.in b/abump.in
index 798fd18..d88d032 100644
--- a/abump.in
+++ b/abump.in
@@ -111,6 +111,7 @@ cvelist=
fixes=
[ -n "$APORTSDIR" ] || error "can't locate \$APORTSDIR"
+[ "$ABUILD_GIT" != "true" ] || die "can't locate git command"
$ABUILD_GIT rev-parse 2>/dev/null || die "not in a git tree"
args=$(getopt -o f:s:Rkqh --long fixes:,security:,recursive,keep,quiet,help \
diff --git a/apkgrel.in b/apkgrel.in
index e5f1ef8..31fe27b 100644
--- a/apkgrel.in
+++ b/apkgrel.in
@@ -107,6 +107,7 @@ while true; do
-z|--zero) setto=0; cmd=do_set;;
-a|--add) cmd=do_add;;
-g|--clean-git) # verify that we're in a git tree
+ [ "$ABUILD_GIT" != "true" ] || die "can't locate git command"
$ABUILD_GIT rev-parse 2>/dev/null || die "not in a git tree"
cmd=do_add
only_clean_git=1;;