diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh index 8be9a6e9a133633661218d54a0057b6c931d3986..a9b9c2e9ce7509d5f31c0540a548c1a1f06011e0 100755 --- a/src/warden-server/sh/install.sh +++ b/src/warden-server/sh/install.sh @@ -42,7 +42,7 @@ err() { echo "FAILED!" cat "$err" - rm -f "$err" "$modules_file" + rm -f "$err" echo echo "Installation of $package_version package FAILED!!!" exit 1 @@ -62,7 +62,7 @@ errClean() done cat "$err" - rm -f "$err" "$modules_file" + rm -f "$err" echo echo "Installation of $package_version package FAILED!!!" exit 1 @@ -125,8 +125,8 @@ perlChck() modulesChck() { - sed '/^use [A-Z]/!d; /Warden/d' $(find "${dirname}" -type f) 2>/dev/null | cut -f 2 -d " " | sed 's/;//' | sort -u > "$modules_file" - for module in $(<"$modules_file"); + sed '/^use [A-Z]/!d; /Warden/d' $(find "${dirname}" -type f) 2>/dev/null | cut -f 2 -d " " | sed 's/;//' | sort -u | \ + while read module; do echo -n "Checking $module module ... " perl -e "use $module" 2> "$err" && echo "OK" || err @@ -206,7 +206,6 @@ paramsChck # set variables err="/tmp/warden-err" -modules_file="/tmp/warden-modules.txt" hostname=$(hostname -f || echo "unspecified.server") dirname=${0%/*} bin="${basedir}/bin" @@ -286,6 +285,6 @@ echo "Installation of $package_version package was SUCCESSFUL!!!" echo # cleanup section -rm -f "$err" "$modules_file" +rm -f "$err" exit 0