From 7f325790e1194f697976d03e2a38d368b05bc709 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 15 Oct 2015 11:20:54 +0200 Subject: [PATCH] git pull after parsing options --- scripts/create-vm.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/create-vm.sh b/scripts/create-vm.sh index f509c0d..c948771 100755 --- a/scripts/create-vm.sh +++ b/scripts/create-vm.sh @@ -5,11 +5,6 @@ DIRNAME=$(dirname $0) BUILD="${HOME}/git-build" -echo "Updating $BUILD" -cd $BUILD -git pull -cd - - LOGS=$HOME/machines [ -d $LOGS ] || { echo "Creating logs dir $LOGS" ; mkdir -p $LOGS; } @@ -62,6 +57,11 @@ container="$1" ; shift [ -d "$BUILD" ] || usage "Could not find directory $BUILD" [ -d /vservers/$container ] && usage "container $container already exists in /vservers" +echo "Updating $BUILD" +cd $BUILD +git pull +cd - + # compute all vars from args [ -z "$DISTRO" ] && DISTRO="$DEFAULT_DISTRO" [ -z "$MEMORY" ] && MEMORY="$DEFAULT_MEMORY" -- 2.43.0