===================================================================
RCS file: /cvs/mss/netupdate/networkupdate.sh,v
retrieving revision 1.8
retrieving revision 1.10
diff -u -r1.8 -r1.10
--- mss/netupdate/networkupdate.sh	2013/07/19 08:48:45	1.8
+++ mss/netupdate/networkupdate.sh	2013/07/19 11:14:58	1.10
@@ -1,7 +1,7 @@
 #!/usr/local/bin/bash
 
 # Use config file instead of editing script itself
-source netupdate.conf
+source /var/lib/mss/netupdate.conf
 
 # Add version file if it's missing (useful on clean systems)
 if [ ! -e /var/lib/mss/version ]; then
@@ -17,11 +17,11 @@
 UPDATEDIR=`ssh $USER@$SERVER grep $MYNAME $HOSTLIST |awk '{print $3}'`
 
 # Check whether we have latest version
-if [ "$(echo "$LOCALVERSION < $VERSION" |bc -l )" -eq 1 ] && [ ! -e $LOCK ]; then
+if [ -n "$VERSION" ] && [ -n "$UPDATEDIR" ] && [ "$(echo "$LOCALVERSION < $VERSION" |bc -l )" -eq 1 ] && [ ! -e $LOCK ]; then
 	echo "Starting update..."
 	touch $LOCK
 	rsync -Havx --ignore-existing --exclude-from=/var/lib/mss/rsync-exclude $USER@$SERVER:$UPDATEDIR/music /var/lib/mss/
-	rsync -Hacvx --exclude-from=/var/lib/mss/rsync-exclude $USER@$SERVER:$UPDATEDIR/$VERSION/1 /var/lib/mss
+	rsync -Hacvx --exclude-from=/var/lib/mss/rsync-exclude $USER@$SERVER:$UPDATEDIR/$VERSION/ /var/lib/mss
    if [ $? -eq 0 ]; then
 	echo "Updated from $LOCALVERSION to $VERSION"
 	echo $VERSION > /var/lib/mss/version
@@ -31,9 +31,11 @@
 	echo "Update failed"
 	ssh $USER@$SERVER "echo "`date` ERROR: $MYNAME update from $UPDATEDIR $LOCALVERSION '->' $VERSION failed" >> $UPDATEDIR/update.log"
    fi
-elif [ "$(echo "$LOCALVERSION < $VERSION" |bc -l )" -eq 1 ] && [ -e $LOCK ]; then
+elif [ -n "$VERSION" ] && [ -n "$UPDATEDIR" ] && [ "$(echo "$LOCALVERSION < $VERSION" |bc -l )" -eq 1 ] && [ -e $LOCK ]; then
 	echo "Update is running..."
 	ssh $USER@$SERVER "echo "`date` WARNING: $MYNAME is still running update from $LOCALVERSION to $VERSION" >> $UPDATEDIR/update.log"
+elif [ -z "$VERSION" ] && [ -z "$UPDATEDIR" ]; then
+	echo "Can't find myself in $HOSTLIST"
 else
 	echo "Version $LOCALVERSION is already installed"
 fi