X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=usr%2Flocal%2Fbin%2Fvserver-hashify-all;h=055cc5101194fd51d0ff35a886e2978f01ce2141;hb=refs%2Fheads%2Fds-host;hp=d1a219089cddf597e601c69ca37465d76b41dc97;hpb=1fdf1adeab11b1b08c5c69dda6175de61f53770d;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/usr/local/bin/vserver-hashify-all b/usr/local/bin/vserver-hashify-all
index d1a2190..055cc51 100755
--- a/usr/local/bin/vserver-hashify-all
+++ b/usr/local/bin/vserver-hashify-all
@@ -3,13 +3,18 @@
 # The dir containing vserver configuration
 VSERVERS_CONF="/etc/vservers"
 
-for VDIR in $VSERVERS_CONF/*; do
+for VDIR in "$VSERVERS_CONF"/*; do
 	NAME=`basename $VDIR`
-	# Check if its config dir exists
+	# Check if its a config dir
 	if [ ! -d "$VDIR" ]; then
 		continue;
 	fi
 	
+	if [ ! -d "$VDIR"/apps/vunify ]; then
+		echo "Skipping vserver $NAME, hashify is disabled"
+		continue
+	fi
+
 	echo "Hashifying vserver $NAME..."
 	sudo vserver "$NAME" hashify
 done
@@ -20,6 +25,6 @@ echo "Cleaning up unused hashed files..."
 for HASH_DIR in "$VSERVERS_CONF"/.defaults/apps/vunify/hash/*; do
 	if [ -L "$HASH_DIR" ]; then
 		# All symbolic links 
-		sudo find -H "$HASH_DIR" -type f -links 1 -print0 | sudo xargs -0 rm
+		sudo find -H "$HASH_DIR" -type f -links 1 -print0 | sudo xargs --null --no-run-if-empty rm
 	fi
 done