everal fixes and more verbose debug output

Author: MaStr

lib/autoconfig.sh

@@ -14,6 +14,11 @@ auto_config_lookup_and_set(){
      $DEBUG && echo "lookup_set: current_status_file - $current_status_file"
 
     if [ -f $filename ] ; then
+
+	$DEBUG && echo "Config file found"
+	$DEBUG && echo -n "   tmp (current): " && cat $current_status_file
+	$DEBUG && echo -n "   config : " &&  cat $filename
+
         if [ "`cat $filename`"  != "`cat $current_status_file`" ] ; then
                 echo " $config - configuration is different, setting to new value"
                 func_set_system_config_$config "`cat $filename `"  "`cat $current_status_file`" 

modules.available/50_piratebox_hostname.sh

@@ -23,7 +23,7 @@ piratebox_install_sh=/opt/piratebox/bin/install_piratebox.sh
 func_read_system_config_piratebox_hostname() {
 	local path=$1 ; shift
 
-	echo "Extracting HOST parameter from piratebox.conf"
+	echo "Extracting HOST parameter from $piratebox_config"
 	config_line=$(grep HOST=\" $piratebox_config )
 	#extract value
 	config_line=${config_line#HOST=\"}
@@ -39,7 +39,7 @@ func_set_system_config_piratebox_hostname(){
 	local old_value=$1; shift
 
 	echo "Changing hostname for PirateBox with install_piratebox.sh"
-	$piratebox_install_sh "$piratebox_config" hostname "$1"
+ 	. $piratebox_install_sh "$piratebox_config" hostname "$value"
 }
 
 
@@ -50,7 +50,7 @@ func_set_system_config_piratebox_hostname(){
 func_compare_and_set_piratebox_hostname(){
 
         auto_config_lookup_and_set  "$piratebox_hostname_myself" \
-                "$cfg_auto_folder/$piratebox_hostename_config_file" \
-                "$cfg_tmp_folder/$piratebox_hostename_config_file"
+                "$cfg_auto_folder/$piratebox_hostname_config_file" \
+                "$cfg_tmp_folder/$piratebox_hostname_config_file"
 
 }

modules.available/60_librarybox_ftp.sh

@@ -17,15 +17,16 @@ librarybox_ftp_config_file="librarybox_ftp.txt"
 
 # FTP configuration is currently located in the hook
 #librarybox_config=/opt/piratebox/conf/piratebox.conf
-piratebox_config=/opt/piratebox/conf/hook_custom.conf
+### duplicate variable name with different content
+librarybox_ftp_piratebox_config=/opt/piratebox/conf/hook_custom.conf
 
 # Read configuration out of the system and save it to librarybox_ftp_system_config depending on the 
 #   parameter
 func_read_system_config_librarybox_ftp() {
 	local path=$1 ; shift
 
-	echo "Extracting FTP parameter from $piratebox_config"
-	config_line=$(grep FTP_ENABLED=\" $piratebox_config )
+	echo "Extracting FTP parameter from $librarybox_ftp_piratebox_config"
+	config_line=$(grep FTP_ENABLED=\" $librarybox_ftp_piratebox_config )
 	#extract value
 	config_line=${config_line#FTP_ENABLED=\"}
 	config_value=${config_line%\"}
@@ -40,7 +41,7 @@ func_set_system_config_librarybox_ftp(){
 	local old_value=$1; shift
 
 	echo "Changing ftp for LibraryBox"
-	sed "s|FTP_ENABLED=\"$old_value\"|FTP_ENABLED=\"$value\"|" -i $piratebox_config
+	sed "s|FTP_ENABLED=\"$old_value\"|FTP_ENABLED=\"$value\"|" -i $librarybox_ftp_piratebox_config
 
 }