diff options
| -rw-r--r-- | abuild.in | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -12,6 +12,7 @@ sysconfdir=@sysconfdir@ datadir=@datadir@ abuild_path=$(readlink -f $0) +git_path=$(command -v git || true) if ! [ -f "$datadir/functions.sh" ]; then echo "$datadir/functions.sh: not found" >&2 @@ -805,13 +806,13 @@ prepare_language_packs() { # echo '-dirty' if git is not clean git_dirty() { - if [ $(git status -s "$startdir" | wc -l) -ne 0 ]; then - echo "-dirty" - fi + [ -z "$git_path" ] && return + [ $(git status -s "$startdir" | wc -l) -ne 0 ] && echo "-dirty" } # echo last commit hash id git_last_commit() { + [ -z "$git_path" ] && return git log --format=oneline -n 1 "$startdir" | awk '{print $1}' } @@ -1524,7 +1525,14 @@ update_abuildrepo_index() { done subpkg_unset - [ -z "$DESCRIPTION" ] && DESCRIPTION="$repo $(cd $startdir && git describe || true)" + if [ -z "$DESCRIPTION" ]; then + if [ -n "$git_path" ]; then + DESCRIPTION="$repo $(cd $startdir && git describe)" + else + DESCRIPTION="$repo" + fi + fi + for i in $allarch; do cd "$REPODEST/$repo/$i" local index=$i/APKINDEX.tar.gz @@ -2376,8 +2384,7 @@ snapshot() { # clone git repo and archive if [ -n "$giturl" ]; then local _version=${verbase:-0}_git${_date} - command -v git >/dev/null || \ - die "Missing git! Install git to support git clone." + [ -z "$git_path" ] && die "Missing git! Install git to support git clone." local _rev="${reporev:-HEAD}" [ "$_rev" = "HEAD" ] && local _depth="--depth=1" msg "Creating git snapshot: $pkgname-$_version" |