===================================================================
RCS file: /cvs/mss/netupdate/networkupdate.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mss/netupdate/networkupdate.sh	2013/07/18 12:26:33	1.4
+++ mss/netupdate/networkupdate.sh	2013/07/18 13:53:20	1.5
@@ -8,8 +8,8 @@
 LOCALVERSION=`cat /var/lib/mss/version`
 
 # Get apropriate programm version and full path to it from fileserver
-VERSION=`ssh $USER@$SERVER grep $NAME $HOSTLIST |awk '{print $2}'`
-UPDATEDIR=`ssh $USER@$SERVER grep $NAME $HOSTLIST |awk '{print $3}'`
+VERSION=`ssh $USER@$SERVER grep $MYNAME $HOSTLIST |awk '{print $2}'`
+UPDATEDIR=`ssh $USER@$SERVER grep $MYNAME $HOSTLIST |awk '{print $3}'`
 
 # Add version file if it's missing (useful on clean systems)
 if [ ! -e /var/lib/mss/version ]; then
@@ -21,14 +21,14 @@
 	echo "Starting update..."
 	touch $LOCK
 	rsync -Hacvx --exclude-from=/var/lib/mss/rsync-exclude $USER@$SERVER:$UPDATEDIR/$VERSION/ /var/lib/mss
-	rsync -Havx --exclude-from=/var/lib/mss/rsync-exclude $USER@$SERVER:$UPDATEDIR/music /var/lib/mss/
+	rsync -Havx --ignore-existing --exclude-from=/var/lib/mss/rsync-exclude $USER@$SERVER:$UPDATEDIR/music /var/lib/mss/
 	echo "Updated from $LOCALVERSION to $VERSION"
 	echo $VERSION > /var/lib/mss/version
-	ssh $USER@$SERVER echo "`date` SUCCESS: $NAME was updated from $UPDATEDIR $LOCALVERSION '->' $VERSION" >> $UPDATEDIR/update.log
+	ssh $USER@$SERVER echo "`date` SUCCESS: $MYNAME was updated from $UPDATEDIR $LOCALVERSION '->' $VERSION" >> $UPDATEDIR/update.log
 	rm -f $LOCK
 elif [ "$(echo "$LOCALVERSION < $VERSION" |bc -l )" -eq 1 ] && [ -e $LOCK ]; then
 	echo "Update is running..."
-	ssh $USER@$SERVER echo "`date` WARNING: $NAME is still running update from $LOCALVERSION to $VERSION" >> $UPDATEDIR/update.log
+	ssh $USER@$SERVER echo "`date` WARNING: $MYNAME is still running update from $LOCALVERSION to $VERSION" >> $UPDATEDIR/update.log
 else
 	echo "Version $LOCALVERSION is already installed"
 fi
@@ -38,4 +38,4 @@
 
 
 # Debug
-echo $USER $SERVER $NAME $UPDATEDIR $VERSION $LOCALVERSION $HOSTLIST
+echo $USER $SERVER $MYNAME $UPDATEDIR $VERSION $LOCALVERSION $HOSTLIST