diff --git a/src/warden-client/sh/install.sh b/src/warden-client/sh/install.sh index 008e2abe49d91b96a548774fa27e85b32147d2e6..d8afba664a66f60f4d24039cc9b6793e6879af37 100755 --- a/src/warden-client/sh/install.sh +++ b/src/warden-client/sh/install.sh @@ -69,7 +69,7 @@ err() cat $err rm -rf $err echo - echo "Installation FAILED!!!" + echo "Installation of $package_name package FAILED!!!" exit 1 } @@ -82,7 +82,7 @@ err_clean() cat $err rm -rf $err echo - echo "Installation FAILED!!!" + echo "Installation of $package_name package FAILED!!!" exit 1 } @@ -308,6 +308,7 @@ root_chck params_chck # create variables +package_name="warden-client-$VERSION" key_file=`basename $key` cert_file=`basename $cert` client_path="$prefix/warden-client" @@ -349,7 +350,7 @@ change_permissions echo echo "Please check configuration file in $conf_file!" echo -echo "Installation was SUCCESSFUL!!!" +echo "Installation of $package_name package was SUCCESSFUL!!!" # cleanup section rm -rf $err diff --git a/src/warden-client/sh/uninstall.sh b/src/warden-client/sh/uninstall.sh index f71c47c092ff22391da7dd05b7074d0ca3361fd6..81d9364c0d604f52e809a60d0a9fc11094b70b50 100755 --- a/src/warden-client/sh/uninstall.sh +++ b/src/warden-client/sh/uninstall.sh @@ -46,7 +46,7 @@ usage() echo "Example: ./`basename $0` -d /opt" echo echo "Note: You must be root for running this script." - echo " For more information about update process, see README file (section Uninstallation)." + echo " For more information about uninstallation process, see README file (section Uninstallation)." echo exit 0 } @@ -66,7 +66,7 @@ err() rm -rf $err rm -rf $backup_dir echo - echo "Update FAILED!!!" + echo "Uninstallation of $package_name package FAILED!!!" exit 1 } @@ -81,7 +81,7 @@ err_clean() rm -rf $err rm -rf $backup_dir echo - echo "Update FAILED!!!" + echo "Uninstallation of $package_name package FAILED!!!" exit 1 } @@ -198,6 +198,7 @@ root_chck params_chck # create variables +package_name="warden-client-$VERSION" client_path="$prefix/warden-client" err="/tmp/warden-err" backup_dir="/tmp/warden-backup" @@ -219,7 +220,7 @@ backup uninstall_warden-client echo -echo "Uninstallation was SUCCESSFUL!!!" +echo "Uninstallation of $package_name package was SUCCESSFUL!!!" # cleanup section rm -rf $err diff --git a/src/warden-client/sh/update.sh b/src/warden-client/sh/update.sh index 952e8a6d023f5816c2a73196b08d39dae1e34273..daf0d599c8b44bf217761c0255b98f9b475e3797 100755 --- a/src/warden-client/sh/update.sh +++ b/src/warden-client/sh/update.sh @@ -67,7 +67,7 @@ err() rm -rf $err rm -rf $backup_dir echo - echo "Update FAILED!!!" + echo "Update to $package_name package FAILED!!!" exit 1 } @@ -82,7 +82,7 @@ err_clean() rm -rf $err rm -rf $backup_dir echo - echo "Update FAILED!!!" + echo "Update to $package_name package FAILED!!!" exit 1 } @@ -179,6 +179,7 @@ warden_dir_chck() fi } + backup() { echo -n "Backing-up warden client directory ... " @@ -305,6 +306,7 @@ root_chck params_chck # create variables +package_name="warden-client-$VERSION" client_path="$prefix/warden-client" etc="$client_path/etc" conf_file="$etc/warden-client.conf" @@ -349,7 +351,7 @@ change_permissions echo echo "Please check configuration file in $conf_file!" echo -echo "Update was SUCCESSFUL!!!" +echo "Update to $package_name package was SUCCESSFUL!!!" # cleanup section rm -rf $err