Skip to content

Commit 20780bd

Browse files
committed
fixing debug calls,
changed config file name to suffix .txt where it was missing
1 parent f29bd93 commit 20780bd

8 files changed

Lines changed: 13 additions & 17 deletions

bin/auto_config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
. ../cfg/auto.config.sh
66
. ../lib/autoconfig.sh
77

8-
DEBUG=1
8+
DEBUG=false
99

1010
_start_

lib/autoconfig.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ auto_config_lookup_and_set(){
99
local filename=$1; shift
1010
local current_status_file=$1; shift
1111

12-
[ $DEBUG ] && echo "lookup_set: config - $config"
13-
[ $DEBUG ] && echo "lookup_set: filename - $filename"
14-
[ $DEBUG ] && echo "lookup_set: current_status_file - $current_status_file"
12+
$DEBUG && echo "lookup_set: config - $config"
13+
$DEBUG && echo "lookup_set: filename - $filename"
14+
$DEBUG && echo "lookup_set: current_status_file - $current_status_file"
1515

1616
if [ -f $filename ] ; then
1717
if [ "`cat $filename`" != "`cat $current_status_file`" ] ; then
@@ -57,8 +57,8 @@ _load_modules_() {
5757

5858
local available_module_files=$(ls $cfg_modules)
5959

60-
[ $DEBUG ] && echo "modules_folder $cfg_modules "
61-
[ $DEBUG ] && echo "ls result: $available_module_files"
60+
$DEBUG && echo "modules_folder $cfg_modules "
61+
$DEBUG && echo "ls result: $available_module_files"
6262

6363
for module in $available_module_files
6464
do
@@ -67,7 +67,7 @@ _load_modules_() {
6767
echo "done"
6868
done
6969

70-
[ $DEBUG ] && echo "Available modules: $MODULE_LIST "
70+
echo "Available modules: $MODULE_LIST "
7171

7272
return 0
7373
}
@@ -97,7 +97,3 @@ _start_() {
9797
cp $cfg_tmp_folder/* $cfg_auto_folder
9898
}
9999

100-
uci() {
101-
102-
echo $*
103-
}

modules.available/50_piratebox_hostname.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MODULE_LIST="$MODULE_LIST piratebox_hostname"
1414

1515
piratebox_hostname_myself="piratebox_hostname" #contains the name of the module
16-
piratebox_hostname_config_file="hostname"
16+
piratebox_hostname_config_file="hostname.txt"
1717

1818
piratebox_config=/opt/piratebox/conf/piratebox.conf
1919
piratebox_install_sh=/opt/piratebox/bin/install_piratebox.sh

modules.available/60_librarybox_ftp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MODULE_LIST="$MODULE_LIST librarybox_ftp"
1414

1515
librarybox_ftp_myself="librarybox_ftp" #contains the name of the module
16-
librarybox_ftp_config_file="librarybox_ftp"
16+
librarybox_ftp_config_file="librarybox_ftp.txt"
1717

1818
# FTP configuration is currently located in the hook
1919
#librarybox_config=/opt/piratebox/conf/piratebox.conf

modules.available/60_librarybox_ftpadmin.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MODULE_LIST="$MODULE_LIST librarybox_ftpadmin"
1414

1515
librarybox_ftpadmin_myself="librarybox_ftpadmin" #contains the name of the module
16-
librarybox_ftpadmin_config_file="librarybox_ftpadmin"
16+
librarybox_ftpadmin_config_file="librarybox_ftpadmin.txt"
1717

1818
# FTP configuration is currently located in the hook
1919
#librarybox_config=/opt/piratebox/conf/piratebox.conf

modules.available/60_librarybox_ftpanon.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MODULE_LIST="$MODULE_LIST librarybox_ftpanon"
1414

1515
librarybox_ftpanon_myself="librarybox_ftpanon" #contains the name of the module
16-
librarybox_ftpanon_config_file="librarybox_ftpanon"
16+
librarybox_ftpanon_config_file="librarybox_ftpanon.txt"
1717

1818
# FTP configuration is currently located in the hook
1919
#librarybox_config=/opt/piratebox/conf/piratebox.conf

modules.available/60_librarybox_ftpsync.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MODULE_LIST="$MODULE_LIST librarybox_ftpsync"
1414

1515
librarybox_ftpsync_myself="librarybox_ftpsync" #contains the name of the module
16-
librarybox_ftpsync_config_file="librarybox_ftpsync"
16+
librarybox_ftpsync_config_file="librarybox_ftpsync.txt"
1717

1818
# FTP configuration is currently located in the hook
1919
#librarybox_config=/opt/piratebox/conf/piratebox.conf

modules.available/60_librarybox_ftpsyncport.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MODULE_LIST="$MODULE_LIST librarybox_ftpsyncport"
1414

1515
librarybox_ftpsyncport_myself="librarybox_ftpsyncport" #contains the name of the module
16-
librarybox_ftpsyncport_config_file="librarybox_ftpsyncport"
16+
librarybox_ftpsyncport_config_file="librarybox_ftpsyncport.txt"
1717

1818
# FTP configuration is currently located in the hook
1919
#librarybox_config=/opt/piratebox/conf/piratebox.conf

0 commit comments

Comments
 (0)