aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-10-26 14:17:47 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-10-26 14:17:47 -0200
commit51b00aa24051e8a6138bce9455e38e61fe87deae (patch)
tree8bde674f5e2f9a2d72bc027fc37747cd9537fb05
parentfc08d8d4e96fb638e3ac8c2a50c973322c278d84 (diff)
downloadpuppet-bootstrap-51b00aa24051e8a6138bce9455e38e61fe87deae.tar.gz
puppet-bootstrap-51b00aa24051e8a6138bce9455e38e61fe87deae.tar.bz2
Deploy: apply patches before deployment (2)
-rwxr-xr-xbin/deploy4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/deploy b/bin/deploy
index 22e3ea8..a61c86f 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -45,12 +45,12 @@ 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 < $patch 2> /dev/null
+ patch -p0 -N --dry-run --silent < $BASEDIR/puppet/files/patches/$DIST/$patch 2> /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
# Apply the patch
- patch -p0 -N < $patch
+ patch -p0 -N < $BASEDIR/puppet/files/patches/$DIST/$patch
fi
done
)