Punch to alpha8

* Merge branch 'development'
* repairs broken timesave functionality
* copy over content instead of moving stuff around

Author: MaStr

Makefile

@@ -1,5 +1,5 @@
 NAME = librarybox
-VERSION = 2.0.0_alpha7
+VERSION = 2.0.0_alpha8
 ARCH = all
 
 #PIRATEBOX_IMG_URL = "http://piratebox.aod-rpg.de/piratebox_ws_0.6_img.gz"

customization/bin/hooks/hook_pre_init.sh

@@ -30,7 +30,7 @@ cp -rv  $PIRATEBOX_FOLDER/www_old/cgi-bin $WWW_FOLDER/cgi-bin
 # Prepare content folder
 echo "Creating 'content' folder on USB stick and move over stuff"
 mkdir -p $WWW_CONTENT
-mv     $PIRATEBOX_FOLDER/www_content/*   $WWW_CONTENT
+cp -r     $PIRATEBOX_FOLDER/www_content/*   $WWW_CONTENT
 # Link to the USB-Stick
 ln -s $WWW_CONTENT  $WWW_FOLDER/content
 

piratebox_origin/piratebox/piratebox/bin/install_piratebox.sh

@@ -151,7 +151,7 @@ if [ $2 = "flush_dns_reg" ] ; then
     echo "Installed crontab for flushing dnsmasq requlary"
 fi
 
-set_Hostname() {
+set_hostname() {
 	local name=$1 ; shift;
 
 	sed  "s|#####HOST#####|$name|g"  $PIRATEBOX_FOLDER/src/redirect.html.schema >  $WWW_FOLDER/redirect.html

piratebox_origin/piratebox/piratebox/bin/timesave.sh

@@ -11,6 +11,11 @@
 #  Licenced under GPL-2  @ 2012
 #    Matthias Strubel    matthias.strubel@aod-rgp.de
 
+##function for similar saving & getting time
+get_datetime() {
+	date +%C%g%m%d%H%M  
+}
+
 
 # Load configfile
 
@@ -34,33 +39,33 @@ if [ "$2" = "install" ] ; then
     echo " */5 * * * *   $PIRATEBOX_FOLDER/bin/timesave.sh $PIRATEBOX_FOLDER/conf/piratebox.conf save "  >> $PIRATEBOX_FOLDER/tmp/crontab
     crontab $PIRATEBOX_FOLDER/tmp/crontab
 
+    echo  "initialize timesave file"
     touch $TIMESAVE
     chmod a+rw $TIMESAVE
+    get_datetime  > $TIMESAVE
 
-    echo "Remember to have cron active..."
-    echo "  on OpenWrt run:  /etc/init.d/cron enable"
-    echo "                   /etc/init.d/cron start"
 
-    #Save the current time
-    $0 $1 "save"
+    echo "Remember MAY have to cron active..."
+    echo "  on OpenWrt run:  /etc/init.d/piratebox enable"
+ 
     exit 0
 fi
 
 if [ "$2" = "save" ] ; then
     if [ -e $TIMESAVE ] ; then
-	if [ `date +%C%g%m%d%H%M` -lt  `cat $TIMESAVE` ] ; then
+	if [ `get_datetime` -lt  `cat $TIMESAVE` ] ; then
 		 logger -s "$0 : sorry, current date-time is lower then saved one, don't save it this time"
 		 exit 1
 	fi
     fi
 
     #Save Datetime in a recoverable format...
-    date +%C%g%m%d%H%M  > $TIMESAVE
+    get_datetime  > $TIMESAVE
     exit 0
 fi
 
 if [ "$2" = "recover" ] ; then
-    if [ `date +%C%g%m%d%H%M` -lt  `cat $TIMESAVE` ] ;
+    if [ `get_datetime` -lt  `cat $TIMESAVE` ] ;
 	    date  `cat $TIMESAVE `
 	    [ "$?" != "0" ] &&  echo "error in recovering time" && exit 255
 	    echo "Time recovered"