Compare commits

..

No commits in common. "4de37ef73b71f4f14798059342008002976973f9" and "b3512e41ebde2c3e812319a6253c390b4199580e" have entirely different histories.

View file

@ -79,7 +79,6 @@ if [ -z "$ARCH" ]; then
export ARCH export ARCH
fi fi
BRANCH=${BRANCH:-master}
VERSION=${VERSION:-latest} VERSION=${VERSION:-latest}
PREFIX=${PREFIX:-/usr} PREFIX=${PREFIX:-/usr}
@ -101,12 +100,9 @@ git clean -dfX # https://github.com/commercial-emacs/commercial
cp -R "$REPOSITORY" "$TMP/${PKGNAM}" cp -R "$REPOSITORY" "$TMP/${PKGNAM}"
cd "$TMP/${PKGNAM}" || exit 1 cd "$TMP/${PKGNAM}" || exit 1
git checkout "$BRANCH"
git pull
case $VERSION in case $VERSION in
trunk) trunk)
VERSION="${BRANCH//-/_}_r$(git rev-list --count HEAD)_$(git log -1 --format=%h)" VERSION="r$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
;; ;;
latest) latest)
VERSION=$(git tag --sort=-version:refname | head -n1) VERSION=$(git tag --sort=-version:refname | head -n1)