mam/mamweb
11
0
Fork 0
Code Issues Pull requests 8 Projects Wiki Activity Actions

make/lib: safe_checkout_branch stačí 1 parametr

Browse source
This commit is contained in:
Pavel "LEdoian" Turinsky 2022-11-20 04:40:03 +01:00
parent e4c2eda955
commit a390ef0329
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
make/deploy
View file

@ -9,7 +9,7 @@ only_in_directory "$TESTWEB"
CURRENT_BRANCH="$(git branch --show-current)"
BRANCH="${1:-$CURRENT_BRANCH}"
safe_checkout_branch "$BRANCH" "$0"
safe_checkout_branch "$BRANCH"
# Teď máme správnou větev, jdeme vše nainstalovat
install_everything

2
make/deploy_prod
View file

@ -18,7 +18,7 @@ fi
# Záloha DB
( cd -P .. && ./backup_prod_db.sh )
safe_checkout_branch "$BRANCH" "$0"
safe_checkout_branch "$BRANCH"
# Teď máme správnou větev, jdeme vše nainstalovat
install_everything

6
make/lib.sh
View file

@ -48,14 +48,12 @@ function only_in_directory {
function safe_checkout_branch {
if "$#" -ne 2
then
echo >&2 "Použití: $0 <branch> <current-script>"
echo >&2 "Použití: $0 <branch>"
return 1
fi
local BRANCH="$1"
local SCRIPT="$2"
echo "Debug: I am $0, $SCRIPT as param"
local SCRIPT="$0"
git fetch --all
# Od teď si musíme dát pozor, abychom nezměnili kód, který právě běží.