mirrors/overleaf-toolkit
1
0
Fork 0
mirror of https://github.com/overleaf/toolkit.git synced 2025-04-19 07:18:06 +02:00
Code Activity

Merge remote-tracking branch 'origin/jpa-relaunch-bin-upgrade' into jpa-msm-overleaf-rc-rebrand

Browse source 
# Conflicts:
#	bin/upgrade
This commit is contained in:
Jakob Ackermann 2024-02-26 17:09:24 +00:00
commit 38c387da19
No known key found for this signature in database
GPG key ID: 30C56800FCA3828A
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bin/upgrade
View file

@ -216,6 +216,8 @@ function handle_git_update() {
echo "Current commit is $current_commit" echo "Current commit is $current_commit"
echo "Updating code..." echo "Updating code..."
git -C "$TOOLKIT_ROOT" pull origin "$current_branch" git -C "$TOOLKIT_ROOT" pull origin "$current_branch"
echo "Relaunching bin/upgrade after code update"
exec $0 --skip-git-update
fi fi
fi fi
} }
@ -231,7 +233,12 @@ function __main__() {
usage && exit usage && exit
fi fi
handle_git_update if [[ "${1:-null}" == "--skip-git-update" ]]; then
echo "Skipping git update"
else
handle_git_update
fi
read_seed_image_version read_seed_image_version
read_image_version read_image_version
handle_rc_rebranding handle_rc_rebranding