common/base.sh

@@ -400,7 +400,6 @@ check_bad_ws_options()
 	# $2 - nfqws/tpws options
 	if [ "$1" = 1 ] && has_bad_ws_options "$2"; then
 		echo "!!! REFUSING TO USE BAD OPTIONS : $2"
-		help_bad_ws_options
 		return 1
 	else
 		return 0
@@ -409,7 +408,8 @@ check_bad_ws_options()
 help_bad_ws_options()
 {
 	echo "WARNING ! you have specified --ipset option"
-	echo "WARNING ! it would work but on ${UNAME:-$(uname)} it's not the best option"
+	echo "WARNING ! it would work but on $UNAME it's not the best option"
 	echo "WARNING ! you should use kernel mode sets. they are much more efficient."
 	echo "WARNING ! to use ipsets you have to write your own custom script"
+	echo "WARNING ! installer will stop here to prevent distribution of easy to use but bad copy-paste solutions"
 }

nfq/nfqws.c

@@ -851,7 +851,7 @@ static unsigned int hash_jen(const void *data,unsigned int len)
 static void exithelp(void)
 {
 	printf(
-		" @<config_file>|$<config_file>\t\t\t; read file for options. must be the only argument. other options are ignored.\n\n"
+		" @<config_file>\t\t\t\t\t; read file for options. must be the only argument. other options are ignored.\n\n"
 		" --debug=0|1|syslog|@<filename>\n"
 #ifdef __linux__
 		" --qnum=<nfqueue_number>\n"
@@ -1070,7 +1070,7 @@ int main(int argc, char **argv)
 	}
 #endif
 
-	if (argc>=2 && (argv[1][0]=='@' || argv[1][0]=='$'))
+	if (argc>=2 && argv[1][0]=='@')
 	{
 		config_from_file(argv[1]+1);
 		argv=params.wexp.we_wordv;

tpws/tpws.c

@@ -122,7 +122,7 @@ static int get_default_ttl(void)
 static void exithelp(void)
 {
 	printf(
-		" @<config_file>|$<config_file>\t\t; read file for options. must be the only argument. other options are ignored.\n\n"
+		" @<config_file>\t\t\t\t; read file for options. must be the only argument. other options are ignored.\n\n"
 		" --bind-addr=<v4_addr>|<v6_addr>\t; for v6 link locals append %%interface_name\n"
 		" --bind-iface4=<interface_name>\t\t; bind to the first ipv4 addr of interface\n"
 		" --bind-iface6=<interface_name>\t\t; bind to the first ipv6 addr of interface\n"
@@ -426,7 +426,7 @@ void parse_params(int argc, char *argv[])
 	dp = &dpl->dp;
 	dp->n = ++desync_profile_count;
 
-	if (argc>=2 && (argv[1][0]=='@' || argv[1][0]=='$'))
+	if (argc>=2 && argv[1][0]=='@')
 	{
 		config_from_file(argv[1]+1);
 		argv=params.wexp.we_wordv;