7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4741 from maljes/master

Browse Source 
Modified branch switch in generate_config.sh
This commit is contained in:
Niklas Meyer
2022-09-08 12:31:44 +02:00
committed by GitHub
parent 9806e568c0 b5f5b53e37
commit 5b30dce609
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
generate_config.sh
View File

@@ -141,15 +141,22 @@ echo "Available Branches:"
echo "- master branch (stable updates) | default, recommended [1]" echo "- master branch (stable updates) | default, recommended [1]"
echo "- nightly branch (unstable updates, testing) | not-production ready [2]" echo "- nightly branch (unstable updates, testing) | not-production ready [2]"
sleep 1 sleep 1
read -r -p "Choose the Branch with it´s number [1/2] " branch
while [ -z "${MAILCOW_BRANCH}" ]; do
read -r -p "Choose the Branch with it´s number [1/2] " branch
case $branch in case $branch in
[2]) [2])
git_branch="nightly" MAILCOW_BRANCH="nightly"
;; ;;
*) *)
git_branch="master" MAILCOW_BRANCH="master"
;; ;;
esac esac
done
if [ ! -z "${MAILCOW_BRANCH}" ]; then
git_branch=${MAILCOW_BRANCH}
fi
git fetch --all git fetch --all
git checkout -f $git_branch git checkout -f $git_branch
@@ -458,4 +465,4 @@ else
echo ' $MAILCOW_UPDATEDAT='$(date +%s)';' >> data/web/inc/app_info.inc.php echo ' $MAILCOW_UPDATEDAT='$(date +%s)';' >> data/web/inc/app_info.inc.php
echo '?>' >> data/web/inc/app_info.inc.php echo '?>' >> data/web/inc/app_info.inc.php
echo -e "\e[33mCannot determine current git repository version...\e[0m" echo -e "\e[33mCannot determine current git repository version...\e[0m"
fi fi