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

Author: mherger
Date: Tue Dec 20 21:46:33 2011
New Revision: 33757

URL: http://svn.slimdevices.com/slim?rev=33757&view=rev
Log:
Bug: n/a
Description: try harder to move/rename data folder.

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=33757&r1=33756&r2=33757&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 Tue Dec 20 21:46:33 2011
@@ -62,20 +62,21 @@
 dpkg -i --force-all squeezeboxserver*.deb &>/dev/null || bye "ERROR: $friendly_name installation failed"
 >/etc/debian_version 
 
-# Argh... ReadyNAS messes up the Samba configuration if there are folders in /c/ - let's hid ours
+# 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 ]; then
-  mv /c/squeezeboxserver /c/.squeezeboxserver > /dev/null 2>&1
+if [ !-e /c/.squeezeboxserver/prefs/server.prefs ]; then
+  mv -f /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 /var/lib/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
-  mv /var/log/squeezeboxserver/* /c/.squeezeboxserver/log/ > /dev/null 2>&1
+  mv -f /var/lib/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
+  mv -f /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
 
 # 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=33757&r1=33756&r2=33757&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 Tue Dec 20 21:46:33 2011
@@ -62,20 +62,21 @@
 dpkg -i --force-all squeezeboxserver*.deb &>/dev/null || bye "ERROR: $friendly_name installation failed"
 >/etc/debian_version && chattr +i /etc/debian_version
 
-# Argh... ReadyNAS messes up the Samba configuration if there are folders in /c/ - let's hid ours
+# 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 ]; then
-  mv /c/squeezeboxserver /c/.squeezeboxserver > /dev/null 2>&1
+if [ !-e /c/.squeezeboxserver/prefs/server.prefs ]; then
+  mv -f /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 /var/lib/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
-  mv /var/log/squeezeboxserver/* /c/.squeezeboxserver/log/ > /dev/null 2>&1
+  mv -f /var/lib/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
+  mv -f /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
 
 # Symlink the new log file to the old location, so the log .zip file picks it up
 rm -f /var/log/slimserver.log