Browse Source

Updated changelog with some info about 0.9.11

bbruns 8 years ago
parent
commit
705e7323a8
2 changed files with 15 additions and 8 deletions
  1. 2
    0
      ChangeLog
  2. 13
    8
      tools/configure-firewall

+ 2
- 0
ChangeLog View File

@@ -2,6 +2,8 @@
2 2
 	- Move some of the config clutter to conf/ - you can
3 3
 	  put your config files anywhere, but by default, they're
4 4
 	  now going to be in conf/
5
+	- Beginning work on configuration tool.  If it ever
6
+	  gets completed is a whole different story.  :)
5 7
 
6 8
 0.9.10 - Brielle Bruns <bruns@2mbit.com>
7 9
 	- Move clamp mss up earlier in the rules to possibly

+ 13
- 8
tools/configure-firewall View File

@@ -47,10 +47,10 @@ if ! ( $WHIPTAIL --title "${TOOL_TITLE}" --yesno "${WELCOME_BODY}" 12 70 --no-bu
47 47
 	exit 1
48 48
 fi
49 49
 
50
-if [ -w $TMPCONFIG ]; then
50
+if [ -w "$TMPCONFIG" ]; then
51 51
 	echo "# Automatically generated config file, please check before actually using." >"${TMPCONFIG}"
52 52
 else
53
-	echo "Error: could not write tmp file for config generation!"
53
+	echo "Error: could not write tmp file for config generation."
54 54
 	exit 1
55 55
 fi
56 56
 
@@ -60,18 +60,23 @@ if ( $WHIPTAIL --title "${TOOL_TITLE}" --yesno "${AUTOCONFIG_PATHS}" 10 40 ); th
60 60
 		IFS_OLD=${IFS};IFS=:
61 61
 		BIN_PATH=($i)
62 62
 		IFS=${IFS_OLD}
63
-		if ( ${WHICH} ${BIN_PATH[0]}&>/dev/null ); then
63
+		if ( ${WHICH} ${BIN_PATH[0]} &>/dev/null ); then
64 64
 			BIN_FULL="`${WHICH} ${BIN_PATH[0]}`"
65 65
 			echo "${BIN_PATH[1]}=\"${BIN_FULL}\"" >>"${TMPCONFIG}"
66 66
 		else
67
-			FAILED_CMD_PATH="${FAILED_CMD_PATH} ${BIN_PATH[0]"
68
-			echo "\#${BIN_PATH[1]}=\"\"" >>"${TMPCONFIG}"
67
+			FAILED_CMD_PATH="${FAILED_CMD_PATH} ${BIN_PATH[0]}"
68
+			echo "#${BIN_PATH[1]}=\"\"" >>"${TMPCONFIG}"
69 69
 		fi
70 70
 	done
71 71
 	if [ "$FAILED_CMD_PATH" ]; then
72 72
 		$WHIPTAIL --title "${TOOL_TITLE}" --msgbox "${FAILED_BINS}\n${FAILED_CMD_PATH}\n${FAILED_BINS_FOOT}" 10 60
73 73
 	fi
74
-#
75
-#else
74
+else
75
+	for i in $AUTOCONFIG_BIN; do
76
+		IFS_OLD=${IFS};IFS=:
77
+		BIN_PATH=($i)
78
+		IFS=${IFS_OLD}
79
+		echo "#${BIN_PATH[1]}=\"\"" >>"${TMPCONFIG}"
76 80
 fi
77
-	
81
+
82
+