saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added fetch & reset to refresh existing repo.

Browse source 
When bootstrap is run more than once on a machine, the existing git
checkout is now refreshed instead of just used as is.
This commit is contained in:
Roberto Aguilar 2013-03-01 00:05:57 -08:00
parent e9737c325c
commit 440df370dc
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bootstrap-salt.sh
View file

@ -722,9 +722,16 @@ __git_clone_and_checkout() {
SALT_GIT_CHECKOUT_DIR=/tmp/git/salt
[ -d /tmp/git ] || mkdir /tmp/git
cd /tmp/git
[ -d $SALT_GIT_CHECKOUT_DIR ] || git clone git://github.com/saltstack/salt.git salt
cd salt
git checkout $GIT_REV
if [ -d $SALT_GIT_CHECKOUT_DIR ]; then
cd $SALT_GIT_CHECKOUT_DIR
git fetch
git reset --hard origin/$GIT_REV
else
git clone git://github.com/saltstack/salt.git salt
cd $SALT_GIT_CHECKOUT_DIR
git checkout $GIT_REV
fi
}