about summary refs log tree commit diff stats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/cfg2html.pl10
-rwxr-xr-xscripts/install-cfg.sh10
2 files changed, 14 insertions, 6 deletions
diff --git a/scripts/cfg2html.pl b/scripts/cfg2html.pl
index 5b5806e6..3b2256a0 100755
--- a/scripts/cfg2html.pl
+++ b/scripts/cfg2html.pl
@@ -23,13 +23,13 @@ use strict;
 
 use Getopt::Std;
 
-our ($opt_a, $opt_m, $opt_s);
+use vars qw($opt_a $opt_m $opt_s);
 
-our (@cats);
-our (%cats);
+use vars qw(@cats);
+use vars qw(%cats);
 
-our (@settings_avail);
-our (%settings_avail);
+use vars qw(@settings_avail);
+use vars qw(%settings_avail);
 
 # Options:
 #	-a	show all options, not only those that are available.
diff --git a/scripts/install-cfg.sh b/scripts/install-cfg.sh
index a3734a00..5780e5c2 100755
--- a/scripts/install-cfg.sh
+++ b/scripts/install-cfg.sh
@@ -18,10 +18,18 @@ if test -f "$DST" ; then
 	trap "rm -f $OLD $NEW $TST $TMP; exit 9" 1 2 5 15
 	rm -f $OLD $NEW $TST $TMP
 
+	# avoid propagating obsolete URLs into new installs
+	echo lynx.browser.org >$TMP
+	echo www.trill-home.com >>$TMP
+	echo www.cc.ukans.edu >>$TMP
+	echo www.ukans.edu >>$TMP
+	echo www.slcc.edu >>$TMP
+	echo sol.slcc.edu >>$TMP
+
 	# Make a list of the settings which are in the original lynx.cfg
 	# Do not keep the user's HELPFILE setting since we modify that in
 	# a different makefile rule.
-	egrep '^[ 	]*[A-Za-z]' $SRC |sed -e 's/^[ 	]*HELPFILE:.*/HELPFILE:/' >$TMP
+	egrep '^[ 	]*[A-Za-z]' $SRC |sed -e 's/^[ 	]*HELPFILE:.*/HELPFILE:/' >>$TMP
 	egrep '^[ 	]*[A-Za-z]' $SRC |fgrep -v -f $TMP >$OLD
 	egrep '^[ 	]*[A-Za-z]' $DST |fgrep -v -f $TMP >$TST