diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-11-28 21:34:46 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-11-28 21:34:46 +0000 |
| commit | f7a6def99a3d14dbc0a1b0af407306701fe236e1 (patch) | |
| tree | 5bf2b577613e3ad81be88fb7aee577434d88be67 /abump.in | |
| parent | 9f703d3222a6a8d52ac560035fb1a988d2f9bff7 (diff) | |
| parent | bea4965bb14fc4d1a44432e107205472a65e74d2 (diff) | |
| download | abuild-f7a6def99a3d14dbc0a1b0af407306701fe236e1.tar.gz abuild-f7a6def99a3d14dbc0a1b0af407306701fe236e1.tar.bz2 abuild-f7a6def99a3d14dbc0a1b0af407306701fe236e1.tar.xz abuild-f7a6def99a3d14dbc0a1b0af407306701fe236e1.zip | |
Merge branch 'apkfoundry' into 'master'3.4.2
Add interposition fixes for use with APK Foundry
See merge request adelie/abuild!5
Diffstat (limited to 'abump.in')
| -rw-r--r-- | abump.in | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -76,8 +76,8 @@ fixes #${fixes#\#} $ABUILD $abuild_opts checksum all - git add APKBUILD - git commit -m"$message" + $ABUILD_GIT add APKBUILD + $ABUILD_GIT commit -m"$message" ) rc=$? if [ $rc -gt 0 ]; then @@ -111,7 +111,8 @@ cvelist= fixes= [ -n "$APORTSDIR" ] || error "can't locate \$APORTSDIR" -git rev-parse 2>/dev/null || die "not 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" args=$(getopt -o f:s:Rkqh --long fixes:,security:,recursive,keep,quiet,help \ -n "$program" -- "$@") |