[Slim-Checkins] r33760 - in /7.7/trunk/platforms/readynas: squeezeboxserver_addon_i386/LogitechMediaServer/install.sh squeezeboxserver_addon_sparc/LogitechMediaServer/install.sh

Author: mherger
Date: Wed Dec 21 00:22:52 2011
New Revision: 33760

URL: http://svn.slimdevices.com/slim?rev=33760&view=rev
Log:
Bug: 17819
Description: don't try to move files, but copy them instead. Moving can fail if target already exists. 

Remove debugging code.

Modified:
    7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/install.sh
    7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/install.sh

Modified: 7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/install.sh
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/install.sh?rev=33760&r1=33759&r2=33760&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/install.sh (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/install.sh Wed Dec 21 00:22:52 2011
@@ -62,21 +62,23 @@
 dpkg -i --force-all squeezeboxserver*.deb &>/dev/null || bye "ERROR: $friendly_name installation failed"
 >/etc/debian_version 
 
+mkdir /c/.squeezeboxserver > /dev/null 2>&1
+
 # Argh... ReadyNAS messes up the Samba configuration if there are folders in /c/ - let's hide ours
 # http://bugs.slimdevices.com/show_bug.cgi?id=17819
 if [ ! -e /c/.squeezeboxserver/prefs/server.prefs ]; then
-  mv -f /c/squeezeboxserver /c/.squeezeboxserver > /dev/null 2>&1
+  cp -rf /c/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
 fi
 
 # we can't leave our files on the root partition, it's too small
 if [ ! -e /c/.squeezeboxserver/prefs/server.prefs ]; then
-  mv -f /var/lib/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
-  mv -f /var/log/squeezeboxserver/* /c/.squeezeboxserver/log/ > /dev/null 2>&1
+  cp -rf /var/lib/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
+  cp -rf /var/log/squeezeboxserver/* /c/.squeezeboxserver/log/ > /dev/null 2>&1
 fi
 
 rm -rf /var/lib/squeezeboxserver
 rm -rf /var/log/squeezeboxserver
-mv /c/squeezeboxserver /c/squeezeboxserver.old
+rm -rf /c/squeezeboxserver
 
 # Symlink the new log file to the old location, so the log .zip file picks it up
 rm -f /var/log/slimserver.log

Modified: 7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/install.sh
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/install.sh?rev=33760&r1=33759&r2=33760&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/install.sh (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/install.sh Wed Dec 21 00:22:52 2011
@@ -62,21 +62,23 @@
 dpkg -i --force-all squeezeboxserver*.deb &>/dev/null || bye "ERROR: $friendly_name installation failed"
 >/etc/debian_version && chattr +i /etc/debian_version
 
+mkdir /c/.squeezeboxserver > /dev/null 2>&1
+
 # Argh... ReadyNAS messes up the Samba configuration if there are folders in /c/ - let's hide ours
 # http://bugs.slimdevices.com/show_bug.cgi?id=17819
 if [ ! -e /c/.squeezeboxserver/prefs/server.prefs ]; then
-  mv -f /c/squeezeboxserver /c/.squeezeboxserver > /dev/null 2>&1
+  cp -rf /c/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
 fi
 
 # we can't leave our files on the root partition, it's too small
 if [ ! -e /c/.squeezeboxserver/prefs/server.prefs ]; then
-  mv -f /var/lib/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
-  mv -f /var/log/squeezeboxserver/* /c/.squeezeboxserver/log/ > /dev/null 2>&1
+  cp -rf /var/lib/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
+  cp -rf /var/log/squeezeboxserver/* /c/.squeezeboxserver/log/ > /dev/null 2>&1
 fi
 
 rm -rf /var/lib/squeezeboxserver
 rm -rf /var/log/squeezeboxserver
-mv /c/squeezeboxserver /c/squeezeboxserver.old
+rm -rf /c/squeezeboxserver
 
 # Symlink the new log file to the old location, so the log .zip file picks it up
 rm -f /var/log/slimserver.log