Clean these up a bunch more - gee I'm glad I do these snapshots, they uncover

*so many problems*.. Too bad the snaps themselves don't get made as a
consequence.. :-)

Bump the date forward Yet Another Day.  David has some changes he wants to
see rolled in, so I guess we're down for Feb 2nd as the snap date!

4 files changed, 11 insertions, 28 deletions

diff --git a/release/scripts/bininst.sh b/release/scripts/bininst.sh
index 39ac25616420..e23c68bf8dfb 100755
--- a/release/scripts/bininst.sh
+++ b/release/scripts/bininst.sh
@@ -13,14 +13,7 @@
 # putting your name on top after doing something trivial like reindenting
 # it, just to make it look like you wrote it!).
 #
-# $Id: bininst.sh,v 1.5 1995/02/02 04:08:12 jkh Exp $
-
-if [ "${_BININST_LOADED_}" = "yes" ]; then
-	error "Error, $0 loaded more than once!"
-	return 1
-else
-	_BININST_LOADED_=yes
-fi
+# $Id: bininst.sh,v 1.6 1995/02/02 04:57:05 jkh Exp $
 
 # Grab the miscellaneous functions.
 . /stand/scripts/miscfuncs.sh
@@ -31,6 +24,9 @@ fi
 # Grab the network setup routines
 . /stand/scripts/netinst.sh
 
+# Grab the setup script
+. /stand/scripts/setup.sh
+
 # Deal with trigger-happy users.
 trap interrupt 1 2 15
 
@@ -50,7 +46,7 @@ welcome()
 
 do_last_config()
 {
-	sh /stand/scripts/setup.sh
+	setup
 	dialog --title "Auf Wiedersehen!" --msgbox \
 "Don't forget that the login name \"root\" has no password.
 If you didn't create any users with adduser, you can at least log in
diff --git a/release/scripts/extract_src.sh b/release/scripts/extract_src.sh
index d20ce702bbb1..0003bfdd680c 100644
--- a/release/scripts/extract_src.sh
+++ b/release/scripts/extract_src.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# $Id: extract_src.sh,v 1.2 1995/01/27 07:49:46 jkh Exp $
+# $Id: extract_src.sh,v 1.3 1995/01/29 08:38:22 jkh Exp $
 PATH=/stand:$PATH
-DDIR=/
+DDIR=/usr/src
 
 for DIST in base srcbin etc games gnu include lib libexec release sbin lkm \
 	release share sys usrbin usrsbin; do
diff --git a/release/scripts/miscfuncs.sh b/release/scripts/miscfuncs.sh
index 3059dd6f7e06..53bd47c4e8a4 100644
--- a/release/scripts/miscfuncs.sh
+++ b/release/scripts/miscfuncs.sh
@@ -10,7 +10,7 @@
 # putting your name on top after doing something trivial like reindenting
 # it, just to make it look like you wrote it!).
 #
-# $Id: miscfuncs.sh,v 1.4 1995/01/29 01:32:32 jkh Exp $
+# $Id: miscfuncs.sh,v 1.5 1995/02/01 10:59:37 jkh Exp $
 
 if [ "${_MISCFUNCS_SH_LOADED_}" = "yes" ]; then
 	return 0
@@ -22,7 +22,7 @@ PATH=/usr/bin:/usr/sbin:/bin:/sbin:/stand
 export PATH
 
 # Keep this current with the distribution!
-DISTNAME="2.0-950201-SNAP"
+DISTNAME="2.0-950202-SNAP"
 
 # Express or Custom install?
 INSTALL_TYPE=""
diff --git a/release/scripts/setup.sh b/release/scripts/setup.sh
index e692809bb022..2beaaa724d15 100644
--- a/release/scripts/setup.sh
+++ b/release/scripts/setup.sh
@@ -1,10 +1,5 @@
 #!/stand/sh
 #
-# bininst - perform the last stage of installation by somehow getting
-# a bindist onto the user's disk and unpacking it.  The name bininst
-# is actually something of a misnomer, since this utility will install
-# more than just the bindist set.
-#
 # Written:  November 11th, 1994
 # Copyright (C) 1994 by Jordan K. Hubbard
 #
@@ -13,14 +8,7 @@
 # putting your name on top after doing something trivial like reindenting
 # it, just to make it look like you wrote it!).
 #
-# $Id: setup.sh,v 1.1 1995/01/14 13:34:37 jkh Exp $
-
-if [ "${_SETUP_LOADED_}" = "yes" ]; then
-        error "Error, $0 loaded more than once!"
-        return 1
-else
-        _SETUP_LOADED_=yes
-fi
+# $Id: setup.sh,v 1.2 1995/01/28 01:18:44 jkh Exp $
 
 # Grab the miscellaneous functions.
 . /stand/scripts/miscfuncs.sh
@@ -31,11 +19,10 @@ setup()
 	while [ "${DONE}" = "" ]; do
 	dialog --title "Configuration Menu" --menu \
 "Configure your system for basic single user, network or\n\
-development workstation usage.  Please select one of the
+development workstation usage.  Please select one of the\n\
 following options.  When you are finished setting up your\n\
 system, select \"done\".  To invoke this configuration tool \n\
 again, type \`/stand/scripts/setup.sh\'." -1 -1 5 \
-"help" "Help!  What does all this mean?" \
 "tzsetup" "Configure your system's time zone" \
 "network" "Configure basic networking parameters" \
 "user" "Add a user name for yourself to the system" \