capistrano-psw 1.0.0.pre27 → 1.0.0.pre28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1314039831c1a334a8164ba5c7f1dc7bffc633c0
-  data.tar.gz: cd56425e874886b04302a9c97eb5ee0a33dc68fc
+  metadata.gz: acd85ce19a85f5c08856fa4745d6fd75d6fc52c4
+  data.tar.gz: 6e5f3201b07a620d980b45b0ecdedfdc3e1041ec
 SHA512:
-  metadata.gz: 94ca83ac39dccd9d712f25ad7f8b7ea40694f7ca19c61bba8bc33efd992850a63f094fc4ea49d0da47e25034ae582829e9b02c502040196da52c0641d6f7fbde
-  data.tar.gz: 48053bdf646775619d9324ccb098813af3b3b9179e56196c611f25b432c797d5ae0ac6bde1406d0ebd7e5ee49da155fa4e857c71767a28d53f1fc8aeb4d35bfd
+  metadata.gz: 429689db9caf51fc67348ced95db8b0d9d0e904a5a8b5d25aec05b787c8af6065639eb05faab07609394c2d6676ca6fa8a00d25d68a4eb5a94d8f1be6d3904e4
+  data.tar.gz: 489b7f91ffc62ea9d58847e0414a8535abe9f3e38debac0270cd9c06e6d51ea8abd78b33c0ab0a8009174d0b8ede8d118f73e4f69d76ea553e167762ed39420f

data/lib/capistrano/psw/version.rb

@@ -10,6 +10,6 @@
 
 module Capistrano
   module Psw
-    VERSION = "1.0.0.pre27"
+    VERSION = "1.0.0.pre28"
   end
 end

data/resources/lib/capistrano/tasks/psw-apache2.cap

@@ -214,23 +214,29 @@ namespace :psw_apache2 do
         exit 1
       fi
       apache_docroot_dir=${apache_docroot_dir:14}
-      apache_docroot_dir=${apache_docroot_dir%?}
+      apache_docroot_dir="${apache_docroot_dir#\"}"
+      apache_docroot_dir="${apache_docroot_dir%\"}"
+
       echo "Apache2 DocRoot: $apache_docroot_dir"
       result=$(sudo rm -rf $apache_docroot_dir)
 
       peppr_docroot="$apache_docroot_dir"
       echo "Peppr DocRoot:  $peppr_docroot"
       echo "Creating link $peppr_docroot to directory $peppr_current_location..."
-      echo "Executing:  sudo ln -nsf $peppr_current_location $peppr_docroot"
-      result=$(sudo rm -rf $peppr_docroot)
+      
+      echo "Executing:  sudo rm -rf $peppr_docroot..."
+      $(sudo rm -rf $peppr_docroot)
+      result=$?
       if [[ $result != 0 ]] ; then
-        echo "Failed to remove current document root!"
+        echo "Failed to remove current document root:  $peppr_docroot!"
         exit 1
       fi
 
-      result=$(sudo ln -nsf $peppr_current_location $peppr_docroot)
+      echo "Executing:  sudo ln -nsf $peppr_current_location $peppr_docroot..."
+      $(sudo ln -nsf $peppr_current_location $peppr_docroot)
+      result=$?
       if [[ $result != 0 ]] ; then
-        echo "Failed to create a symbolic link to new document root!"
+        echo "Failed to create a symbolic link ($peppr_current_location) to new document root ($peppr_docroot)!"
         exit 1
       fi
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-psw
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre27
+  version: 1.0.0.pre28
 platform: ruby
 authors:
 - Lexmark International Technology S.A