[Slim-Checkins] r33816 - in /7.7/trunk/platforms/readynas/addon_template: install.sh remove.sh start.sh stop.sh

Author: mherger
Date: Tue Feb  7 05:48:41 2012
New Revision: 33816

URL: http://svn.slimdevices.com/slim?rev=33816&view=rev
Log:
Fixed Bug: 17680
Description: silence some warnings and messages to stdout to get rid of the "install failed" message.

Modified:
    7.7/trunk/platforms/readynas/addon_template/install.sh
    7.7/trunk/platforms/readynas/addon_template/remove.sh
    7.7/trunk/platforms/readynas/addon_template/start.sh
    7.7/trunk/platforms/readynas/addon_template/stop.sh

Modified: 7.7/trunk/platforms/readynas/addon_template/install.sh
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/addon_template/install.sh?rev=33816&r1=33815&r2=33816&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/addon_template/install.sh (original)
+++ 7.7/trunk/platforms/readynas/addon_template/install.sh Tue Feb  7 05:48:41 2012
@@ -69,20 +69,20 @@
 if [ ! -e /c/.squeezeboxserver/prefs/server.prefs ]; then
   cp -rf /var/lib/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
   cp -rf /var/log/squeezeboxserver/* /c/.squeezeboxserver/log/ > /dev/null 2>&1
+else
+	# remove invalid dbsource definition
+	grep -v "dbsource.*/c/sq" /c/.squeezeboxserver/prefs/server.prefs > /tmp/server.prefs 2> /dev/null
+	cp /tmp/server.prefs /c/.squeezeboxserver/prefs/server.prefs > /dev/null 2>&1
+	rm -f /tmp/server.prefs > /dev/null 2>&1
 fi
 
-# remove invalid dbsource definition
-grep -v "dbsource.*/c/sq" /c/.squeezeboxserver/prefs/server.prefs > /tmp/server.prefs
-cp /tmp/server.prefs /c/.squeezeboxserver/prefs/server.prefs
-rm -f /tmp/server.prefs
-
-rm -rf /var/lib/squeezeboxserver
-rm -rf /var/log/squeezeboxserver
-rm -rf /c/squeezeboxserver
+rm -rf /var/lib/squeezeboxserver > /dev/null 2>&1
+rm -rf /var/log/squeezeboxserver > /dev/null 2>&1
+rm -rf /c/squeezeboxserver > /dev/null 2>&1
 
 # Symlink the new log file to the old location, so the log .zip file picks it up
-rm -f /var/log/slimserver.log
-ln -sf /c/.squeezeboxserver/log/server.log /var/log/slimserver.log 
+rm -f /var/log/slimserver.log > /dev/null 2>&1
+ln -sf /c/.squeezeboxserver/log/server.log /var/log/slimserver.log  > /dev/null 2>&1
 
 ######################################################
 

Modified: 7.7/trunk/platforms/readynas/addon_template/remove.sh
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/addon_template/remove.sh?rev=33816&r1=33815&r2=33816&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/addon_template/remove.sh (original)
+++ 7.7/trunk/platforms/readynas/addon_template/remove.sh Tue Feb  7 05:48:41 2012
@@ -38,7 +38,7 @@
 sed -i "/^${SERVICE}\!\!/d" /etc/frontview/addons/addons.conf
 
 # Reread modified service configuration files
-killall -USR1 apache-ssl
+(/usr/sbin/apache-ssl -f /etc/frontview/apache/httpd.conf -t > /dev/null 2>&1) && (/usr/sbin/apache-ssl -f /etc/frontview/apache/httpd.conf -k graceful > /dev/null 2>&1)
 
 # Now remove ourself
 rm -f $0

Modified: 7.7/trunk/platforms/readynas/addon_template/start.sh
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/addon_template/start.sh?rev=33816&r1=33815&r2=33816&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/addon_template/start.sh (original)
+++ 7.7/trunk/platforms/readynas/addon_template/start.sh Tue Feb  7 05:48:41 2012
@@ -2,4 +2,4 @@
 #
 # This should contain necessary code to start the service
 
-/etc/init.d/squeezeboxserver start
+/etc/init.d/squeezeboxserver start > /dev/null 2>&1

Modified: 7.7/trunk/platforms/readynas/addon_template/stop.sh
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/addon_template/stop.sh?rev=33816&r1=33815&r2=33816&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/addon_template/stop.sh (original)
+++ 7.7/trunk/platforms/readynas/addon_template/stop.sh Tue Feb  7 05:48:41 2012
@@ -2,4 +2,4 @@
 #
 # This should contain necessary code to stop the service
 
-/etc/init.d/squeezeboxserver stop
+/etc/init.d/squeezeboxserver stop > /dev/null 2>&1