Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix Upstream Commit ID grep

Browse Source
This commit is contained in:
DerLinkman 2022-08-24 16:26:07 +02:00
parent ef311f22bf
commit 5ea4305185
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
update.sh
View File

@ -872,7 +872,7 @@ fi
if [ ${BRANCH} == "master" ]; then if [ ${BRANCH} == "master" ]; then
mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`) mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`)
elif [ ${BRANCH} == "nightly" ]; then elif [ ${BRANCH} == "nightly" ]; then
mailcow_git_version=$(git rev-parse origin/${BRANCH} --short HEAD | head -2 | tail -1) mailcow_git_version=$(git rev-parse --short $(git rev-parse @{upstream}))
mailcow_last_git_version="" mailcow_last_git_version=""
else else
mailcow_git_version=$(git rev-parse --short HEAD) mailcow_git_version=$(git rev-parse --short HEAD)
@ -928,8 +928,8 @@ if [ -f "${SCRIPT_DIR}/post_update_hook.sh" ]; then
bash "${SCRIPT_DIR}/post_update_hook.sh" bash "${SCRIPT_DIR}/post_update_hook.sh"
fi fi
echo "In case you encounter any problem, hard-reset to a state before updating mailcow:" # echo "In case you encounter any problem, hard-reset to a state before updating mailcow:"
echo # echo
git reflog --color=always | grep "Before update on " # git reflog --color=always | grep "Before update on "
echo # echo
echo "Use \"git reset --hard hash-on-the-left\" and run $COMPOSE_COMMAND up -d afterwards." # echo "Use \"git reset --hard hash-on-the-left\" and run $COMPOSE_COMMAND up -d afterwards."