From 66bd115fbfddc3bd0ab61ea6f71d602485ac6be3 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 26 Oct 2015 14:27:23 -0200 Subject: Deploy: fixes --- bin/deploy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/deploy b/bin/deploy index a61c86f..0b036d8 100755 --- a/bin/deploy +++ b/bin/deploy @@ -45,7 +45,7 @@ if [ -d "$BASEDIR/puppet/files/patches/$DIST" ]; then # Only apply if needed # Thanks https://unix.stackexchange.com/questions/55780/check-if-a-file-or-folder-has-been-patched-already for patch in `ls $BASEDIR/puppet/files/patches/$DIST`; do - patch -p0 -N --dry-run --silent < $BASEDIR/puppet/files/patches/$DIST/$patch 2> /dev/null + patch -p0 -N --dry-run --silent < $BASEDIR/puppet/files/patches/$DIST/$patch &> /dev/null # If the patch has not been applied then the $? which is the exit status # for last command would have a success status code = 0 if [ "$?" == "0" ]; then @@ -58,4 +58,4 @@ fi # Run puppet apply PUPPET_OPTS="--confdir=$BASEDIR/puppet --modulepath=$BASEDIR/puppet/modules" -$SUDO LC_ALL=C puppet apply $PUPPET_OPTS $PUPPET_MANIFEST" +LC_ALL=C $SUDO puppet apply $PUPPET_OPTS $PUPPET_MANIFEST -- cgit v1.2.3