Merge branch 'main' of ssh://src.le-moine.org:38172/gwh/slackbuilds
This commit is contained in:
commit
2d1ac97d45
1 changed files with 5 additions and 1 deletions
|
@ -79,6 +79,7 @@ if [ -z "$ARCH" ]; then
|
|||
export ARCH
|
||||
fi
|
||||
|
||||
BRANCH=${BRANCH:-master}
|
||||
VERSION=${VERSION:-latest}
|
||||
|
||||
PREFIX=${PREFIX:-/usr}
|
||||
|
@ -100,9 +101,12 @@ git clean -dfX # https://github.com/commercial-emacs/commercial
|
|||
cp -R "$REPOSITORY" "$TMP/${PKGNAM}"
|
||||
cd "$TMP/${PKGNAM}" || exit 1
|
||||
|
||||
git checkout "$BRANCH"
|
||||
git pull
|
||||
|
||||
case $VERSION in
|
||||
trunk)
|
||||
VERSION="r$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
|
||||
VERSION="${BRANCH//-/_}_r$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
|
||||
;;
|
||||
latest)
|
||||
VERSION=$(git tag --sort=-version:refname | head -n1)
|
||||
|
|
Loading…
Reference in a new issue