more script cleanup and a readme clarification

Author: francistheodorecatte

README.MD

@@ -23,7 +23,7 @@ This is Zurk's Offline Firmware v34, backported to the Chumby Classic.
 
 * You will need to change the control panel time to your correct location after bootup. Also change the brightness and sound to your preference. 
 
-* Ensure your chumby is activated, on the network and fully operational with the latest firmware (v1.0.7) prior to using the offline firmware. 
+* Ensure your chumby is activated, on the network and fully operational with the included firmware (update.zip) prior to using this offline firmware. 
 
 * Although you do not need to activate your chumby and can run this offline firmware completely without a network, for a first time installation both network and activated chumby are recommended to make life simple. For operating in network-less environments please delete the file autoreboot.on from the chumby storage root. 
 

debugchumby

@@ -8,50 +8,47 @@ rm -f /mnt/usb/tmp/*
 # start lighttpd
 LD_LIBRARY_PATH=/mnt/usb/lighty/lib:${LD_LIBRARY_PATH} /mnt/usb/lighty/sbin/lighttpd -m /mnt/usb/lighty/lib -f /mnt/usb/lighty/lighttpd.conf >/mnt/usb/tmp/write.ok
 if [ -f /mnt/usb/autoreboot.on ]; then
-/mnt/usb/TalkingChumby/say.sh "Welcome to Zurk's Chumby Offline Firmware v 34"
+	/mnt/usb/TalkingChumby/say.sh "Welcome to Zurk's Chumby Offline Firmware v 34"
 else
-# rebind /scripts  for /usr/chumby/scripts.  disable the networking scripts as required.
-#/usr/bin/iwconfig wlan0 mode Ad-Hoc essid chumbynet key AAAA-1111-22 2>&1 >> /mnt/usb/ifconfig.log
-#/sbin/ifconfig wlan0 192.168.2.2 netmask 255.255.255.0 broadcast 192.168.2.255  2>&1 >> /mnt/usb/ifconfig.log
-#/sbin/ifconfig wlan0 up 2>&1 >> /mnt/usb/ifconfig.log
-#/sbin/ifconfig  2>&1 >> /mnt/usb/ifconfig.log
-#mkdir /mnt/usb/tmp
-#cp -r /tmp /mnt/usb/tmp
-#sync
-if [ "$stff" = "1.0.7" ]; then
-mount /mnt/usb/scripts -o bind /usr/chumby/scripts
-fi
-sync
-/mnt/usb/TalkingChumby/say.sh "Welcome to Zurk's Chumby Offline Firmware v 34 in networkless mode"
+	# rebind /scripts  for /usr/chumby/scripts.  disable the networking scripts as required.
+	#/usr/bin/iwconfig wlan0 mode Ad-Hoc essid chumbynet key AAAA-1111-22 2>&1 >> /mnt/usb/ifconfig.log
+	#/sbin/ifconfig wlan0 192.168.2.2 netmask 255.255.255.0 broadcast 192.168.2.255  2>&1 >> /mnt/usb/ifconfig.log
+	#/sbin/ifconfig wlan0 up 2>&1 >> /mnt/usb/ifconfig.log
+	#/sbin/ifconfig  2>&1 >> /mnt/usb/ifconfig.log
+	#mkdir /mnt/usb/tmp
+	#cp -r /tmp /mnt/usb/tmp
+	#sync
+	if [ "$stff" = "1.0.7" ]; then
+		mount /mnt/usb/scripts -o bind /usr/chumby/scripts
+	fi
+	sync
+	/mnt/usb/TalkingChumby/say.sh "Welcome to Zurk's Chumby Offline Firmware v 34 in networkless mode"
 fi
 if [ -f /mnt/usb/tmp/write.ok ]; then
-sync
+	sync
 else
-/mnt/usb/TalkingChumby/say.sh "Error the storage disk is read only"
-fi
-
-sync
+	/mnt/usb/TalkingChumby/say.sh "Error the storage disk is read only"
 fi
 if [ -f /mnt/usb/dlna.on ]; then
-cp /mnt/usb/dlna.on /tmp/dlna.on
+	cp /mnt/usb/dlna.on /tmp/dlna.on
 else
-sync
+	sync
 fi
 if [ -f /mnt/usb/bonjour.off ]; then
-cp /mnt/usb/bonjour.off /tmp/bonjour.off
+	cp /mnt/usb/bonjour.off /tmp/bonjour.off
 else
-sync
+	sync
 fi
 if [ -f /mnt/usb/swapfile.on ]; then
-rm -f /mnt/usb.swap
-rm -f /mnt/usb/swapfile.on
-/mnt/usb/TalkingChumby/say.sh "Building the 512 MegaByte swapfile"
-dd if=/dev/zero of=/mnt/usb/.swap bs=1 count=0 seek=512M
-/mnt/usb/TalkingChumby/say.sh "Making the swapfile"
-mkswap /mnt/usb/.swap
-/mnt/usb/TalkingChumby/say.sh "Swapfile built O K"
+	rm -f /mnt/usb.swap
+	rm -f /mnt/usb/swapfile.on
+	/mnt/usb/TalkingChumby/say.sh "Building the 512 MegaByte swapfile"
+	dd if=/dev/zero of=/mnt/usb/.swap bs=1 count=0 seek=512M
+	/mnt/usb/TalkingChumby/say.sh "Making the swapfile"
+	mkswap /mnt/usb/.swap
+	/mnt/usb/TalkingChumby/say.sh "Swapfile built O K"
 else
-sync
+	sync
 fi
 cp -f /mnt/usb/www/gif.swf /tmp/gif.swf
 cp -f /mnt/usb/www/gif.swf /tmp/sat.swf

debugchumbyearly

@@ -1,11 +1,12 @@
+#!/bin/sh
 if [ -f /mnt/usb/foistrun ]; then
 	cp -a /psp/ts_settings /mnt/usb/psp
 	cp -a /psp/timezone /mnt/usb/psp
 	cp -a /psp/timezone_city /mnt/usb/psp
 	cp -a /psp/clock_format /mnt/usb/psp
 	cp -a /psp/network_config /mnt/usb/psp
+	rm -f /mnt/usb/foistrun
 fi
 mount /mnt/usb/psp -o bind /psp
-rm -f /mnt/usb/foistrun
 sync
 nice -n -20 /usr/sbin/httpd -h /mnt/usb/www -c /psp/httpd.conf

psp/zwapi.sh

@@ -110,9 +110,8 @@ if [ ! -e /tmp/zwapi.lock ]; then
 		sync
 		/usr/chumby/scripts/reboot_normal.sh
 	fi
-fi
-rm -f /mnt/storage/widgetcache/*
-rm -f /tmp/zwapi.lock
+	rm -f /mnt/storage/widgetcache/*
+	rm -f /tmp/zwapi.lock
 else
 	echo locked >>/mnt/usb/orangebox.txt
 fi