diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-10-26 14:27:23 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-10-26 14:27:23 -0200 |
| commit | 66bd115fbfddc3bd0ab61ea6f71d602485ac6be3 (patch) | |
| tree | b34f575d2912c061ec1c759c51ebcb447dc5d65d /bin | |
| parent | 51b00aa24051e8a6138bce9455e38e61fe87deae (diff) | |
| download | puppet-bootstrap-66bd115fbfddc3bd0ab61ea6f71d602485ac6be3.tar.gz puppet-bootstrap-66bd115fbfddc3bd0ab61ea6f71d602485ac6be3.tar.bz2 | |
Deploy: fixes
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/deploy | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |