]> gitweb.fluxo.info Git - puppet-bootstrap.git/commitdiff
Deploy: apply patches before deployment (2)
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 26 Oct 2015 16:17:47 +0000 (14:17 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 26 Oct 2015 16:17:47 +0000 (14:17 -0200)
bin/deploy

index 22e3ea8937e1f02769ebd8f635e1f5a474fa0c37..a61c86f572ea7c22c4439b793ca358424f938fe6 100755 (executable)
@@ -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
   )