diff --git a/generate.sh b/generate.sh index d32d8af..f84a622 100755 --- a/generate.sh +++ b/generate.sh @@ -30,11 +30,11 @@ set +e ### if [ -z "${RELEASE}" ]; then - if git describe --contains "$(git rev-parse HEAD)" &>/dev/null; then + if true; then RELEASE=1 else DATE=${DATE:-$(date +%Y%m%d)} - GIT=$(git rev-parse --short HEAD) + GIT= RELEASE="0.${DATE}git${GIT}" fi fi @@ -85,7 +85,6 @@ fi set -e UNAME_PATH=$(mktemp -d) -BUILD_DIR=$(mktemp -d) _POSTIN=$(mktemp) _PREUN=$(mktemp) @@ -93,7 +92,7 @@ _POSTUN=$(mktemp) _POSTUP=$(mktemp) # shellcheck disable=SC2064 -trap "rm -rf ${UNAME_PATH} ${BUILD_DIR} ${_POSTIN} ${_PREUN} ${_POSTUN} ${_POSTUP}" EXIT +trap "rm -rf ${UNAME_PATH} ${_POSTIN} ${_PREUN} ${_POSTUN} ${_POSTUP}" EXIT while IFS= read -r -d $'\0' SRC; do F_TAGS=${SRC##*##} @@ -185,7 +184,7 @@ else "${BUILD_DIR}/usr/sbin/onesysprep" # shellcheck disable=SC2086 - fpm --name "${NAME}" --version "${VERSION}" --iteration "${RELEASE_FULL}" \ +echo 'Info: Composed fpm command is' fpm --name "${NAME}" --version "${VERSION}" --iteration "${RELEASE_FULL}" \ --architecture all --license "${LICENSE}" \ --vendor "${VENDOR}" --maintainer "${MAINTAINER}" \ --description "${DESCRIPTION}" --url "${URL}" \