From dd875263f23d74c9626d0d4d7d17b21c62fb602d Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Sat, 3 Jan 2015 10:57:15 +0100
Subject: [PATCH] podminky pro spusteni funkce createSymlinks presunuty do tela
funkce; zmena nazvu funkce
---
src/warden-server/sh/update.sh | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index 68e6341..0d5ca00 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -189,7 +189,7 @@ doTemplate()
}
-cleanOldFiles()
+removeOldFiles()
{
echo -n "Removing old package files ... "
rm -f "${etc}/warden-client.conf" 2> /dev/null
@@ -210,12 +210,17 @@ createManifest()
createSymlinks()
{
- echo "Creating symbolic links to $symbin ..."
- for file in "${bin}/"*
- do
- echo "- making symlink: ${symbin}/${file##*/} -> $file"
- ln -s "$file" "${symbin}/${file##*/}"
- done
+ echo -n "Checking symbolic links directory $symbin ... "
+ if [[ -d $symbin && -w $symbin ]]; then
+ echo "OK"
+ for file in "${bin}/"*
+ do
+ echo "- making symlink: ${symbin}/${file##*/} -> $file"
+ ln -s "$file" "${symbin}/${file##*/}"
+ done
+ else
+ echo "FAILED!"
+ fi
}
@@ -391,14 +396,14 @@ else
> $watchdog_conf && echo "OK" || errClean
fi
-# cleaning of files from old package - depend on package version
-cleanOldFiles
+# remove files of old packages - file list depend on package version
+removeOldFiles
# create MANIFEST file
createManifest
# crate symlinks from warden server bin to user path (if -s option is set)
-[[ ! -z "$symbin" ]] && [[ -d "$symbin" ]] && [[ -w "$symbin" ]] && createSymlinks
+[[ ! -z "$symbin" ]] && createSymlinks
echo
echo "------------------------- Summary ---------------------------------------"
--
GitLab