Update pro install script to checkout base branch only when feature branch doesn't exist
This commit is contained in:
parent
12abe4adcc
commit
d736e558f9
|
@ -20,8 +20,12 @@ if [[ -d "budibase-pro" ]]; then
|
||||||
|
|
||||||
# Try to checkout the matching pro branch
|
# Try to checkout the matching pro branch
|
||||||
git checkout $BRANCH
|
git checkout $BRANCH
|
||||||
# Try to checkout the matching pro base (master or develop) branch
|
|
||||||
|
if [[ $? == "1" ]] && [[ $BASE_BRANCH ]]; then
|
||||||
|
# There is no matching branch, try to match the base branch
|
||||||
git checkout $BASE_BRANCH
|
git checkout $BASE_BRANCH
|
||||||
|
fi
|
||||||
|
|
||||||
# If neither branch exists continue with default branch 'develop'
|
# If neither branch exists continue with default branch 'develop'
|
||||||
git pull
|
git pull
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue