capistrano-psw 1.0.0.pre26 → 1.0.0.pre27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b45c0181d30ed32ef122ba22294855ca16d5ae4f
-  data.tar.gz: da3b76a4f7f672f7ac5cda85fe9aa43406672d54
+  metadata.gz: 1314039831c1a334a8164ba5c7f1dc7bffc633c0
+  data.tar.gz: cd56425e874886b04302a9c97eb5ee0a33dc68fc
 SHA512:
-  metadata.gz: 83dfa5db7424e20d2c4e1d21e8f93a4d1712d86f82ecf636f14564b8ac17a109592278d112a37e30f76acbf5e693a2fb41e20bfa29be9f4282f5414f09ba1587
-  data.tar.gz: 4b698689b09e30fd3ea63e3545b668463f36168eca57f8741f764dfaedece2b91af7441f77ec05325c6706d400ed0617f2273f6149bddba3aa66b9e23c897bba
+  metadata.gz: 94ca83ac39dccd9d712f25ad7f8b7ea40694f7ca19c61bba8bc33efd992850a63f094fc4ea49d0da47e25034ae582829e9b02c502040196da52c0641d6f7fbde
+  data.tar.gz: 48053bdf646775619d9324ccb098813af3b3b9179e56196c611f25b432c797d5ae0ac6bde1406d0ebd7e5ee49da155fa4e857c71767a28d53f1fc8aeb4d35bfd

data/lib/capistrano/psw/version.rb

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

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

@@ -175,7 +175,7 @@ namespace :psw_apache2 do
       peppr_current_location=$1
       if [ -z "$peppr_current_location" ]; then
         echo "Peppr current location not specified!"
-        exit 0
+        exit 1
       fi
       echo "Current peppr location:  $peppr_current_location"
 
@@ -192,7 +192,7 @@ namespace :psw_apache2 do
       apache_config_location=$($apache_service_name -V | grep -i " -D HTTPD_ROOT=")
       if [ -z "$apache_config_location" ]; then
         echo "No apache configuration location has been defined!"
-        exit 0
+        exit 1
       fi
       apache_config_location=${apache_config_location:16}
       apache_config_location=${apache_config_location%?}
@@ -201,7 +201,7 @@ namespace :psw_apache2 do
       apache_config_file==$($apache_service_name -V | grep -i " -D SERVER_CONFIG_FILE=")
       if [ -z "$apache_config_location" ]; then
         echo "No apache configuration file has been defined!"
-        exit 0
+        exit 1
       fi
       apache_config_file=${apache_config_file:25}
       apache_config_file=${apache_config_file%?}
@@ -211,7 +211,7 @@ namespace :psw_apache2 do
       apache_docroot_dir=$(grep -i 'DocumentRoot ' $apache_config_file_location)
       if [ -z "$apache_docroot_dir" ]; then
         echo "Unable to find apache's DocumentRoot!"
-        exit 0
+        exit 1
       fi
       apache_docroot_dir=${apache_docroot_dir:14}
       apache_docroot_dir=${apache_docroot_dir%?}
@@ -223,11 +223,20 @@ namespace :psw_apache2 do
       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)
+      if [[ $result != 0 ]] ; then
+        echo "Failed to remove current document root!"
+        exit 1
+      fi
+
       result=$(sudo ln -nsf $peppr_current_location $peppr_docroot)
+      if [[ $result != 0 ]] ; then
+        echo "Failed to create a symbolic link to new document root!"
+        exit 1
+      fi
 
       link_listing=$(ls -la $peppr_docroot)
       echo "Resulting Link: $link_listing"
-      echo "Script completed!"     
+      echo "Script completed!"
     eos
 
     local_script_dir= PepprAppDeployFileUtils::Local::get_deployment_scripts_dir

metadata

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