Skip to content

Commit 8c05185

Browse files
Syrussmesdaghi
authored andcommitted
if on a branch as opposed to tag or commit, do a pull.
1 parent 84f3d26 commit 8c05185

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

solo/geoshape-upgrade.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@ set -e
66
pushd .
77

88
cd /opt/rogue-chef-repo
9-
#git pull
9+
10+
CURRENT_BRANCH=`git branch | sed -n '/\* /s///p'`
11+
if ["$CURRENT_BRANCH" != "(no branch)"]
12+
then
13+
git pull
14+
fi
15+
1016
bundle update
1117
berks update
1218
rm -rf /opt/chef-run/cookbooks

0 commit comments

Comments
 (0)