Make the editor a selectable option. Some people don't care for `ee'!

6 files changed, 14 insertions, 7 deletions

diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 9c9e60a..9a1fd7f 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.76 1996/03/02 07:31:54 jkh Exp $
+ * $Id: install.c,v 1.77 1996/03/18 15:27:54 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -786,6 +786,7 @@ installVarDefaults(char *unused)
     variable_set2(VAR_RELNAME,			RELEASE_NAME);
     variable_set2(VAR_CPIO_VERBOSITY,		"high");
     variable_set2(VAR_TAPE_BLOCKSIZE,		DEFAULT_TAPE_BLOCKSIZE);
+    variable_set2(VAR_EDITOR,			"/stand/ee");
     variable_set2(VAR_FTP_USER,			"ftp");
     variable_set2(VAR_BROWSER_PACKAGE,		"lynx-2.4.2");
     variable_set2(VAR_BROWSER_BINARY,		"/usr/local/bin/lynx");
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 01eb68b..9a91d87 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.46 1996/03/18 15:28:06 jkh Exp $
+ * $Id: sysinstall.h,v 1.47 1996/03/21 09:30:15 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -108,6 +108,7 @@
 #define VAR_DISK			"disk"
 #define VAR_DISKSPACE			"diskSpace"
 #define VAR_DOMAINNAME			"domainname"
+#define VAR_EDITOR			"editor"
 #define VAR_EXTRAS			"ifconfig_"
 #define VAR_FTP_ONERROR			"ftpOnError"
 #define VAR_FTP_PASS			"ftpPass"
diff --git a/usr.sbin/sysinstall/anonFTP.c b/usr.sbin/sysinstall/anonFTP.c
index beb54e6..0af53be 100644
--- a/usr.sbin/sysinstall/anonFTP.c
+++ b/usr.sbin/sysinstall/anonFTP.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: anonFTP.c,v 1.7 1996/03/02 07:31:48 jkh Exp $
+ * $Id: anonFTP.c,v 1.8 1996/03/18 15:27:39 jkh Exp $
  *
  * Copyright (c) 1995
  *	Coranth Gryphon.  All rights reserved.
@@ -472,7 +472,7 @@ configAnonFTP(char *unused)
 	    dialog_clear();
 	    msgNotify("Uncompressing the editor - please wait..");
 	    vsystem("echo Your welcome message here. > %s/etc/%s", tconf.homedir, MOTD_FILE);
-	    sprintf(cmd, "/stand/ee %s/etc/%s", tconf.homedir, MOTD_FILE);
+	    sprintf(cmd, "%s %s/etc/%s", variable_get(VAR_EDITOR), tconf.homedir, MOTD_FILE);
 	    systemExecute(cmd);
 	}
     }
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 9c9e60a..9a1fd7f 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.76 1996/03/02 07:31:54 jkh Exp $
+ * $Id: install.c,v 1.77 1996/03/18 15:27:54 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -786,6 +786,7 @@ installVarDefaults(char *unused)
     variable_set2(VAR_RELNAME,			RELEASE_NAME);
     variable_set2(VAR_CPIO_VERBOSITY,		"high");
     variable_set2(VAR_TAPE_BLOCKSIZE,		DEFAULT_TAPE_BLOCKSIZE);
+    variable_set2(VAR_EDITOR,			"/stand/ee");
     variable_set2(VAR_FTP_USER,			"ftp");
     variable_set2(VAR_BROWSER_PACKAGE,		"lynx-2.4.2");
     variable_set2(VAR_BROWSER_BINARY,		"/usr/local/bin/lynx");
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index 9ea597d..c4e9a84 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: options.c,v 1.28 1996/03/19 12:08:00 jkh Exp $
+ * $Id: options.c,v 1.29 1996/03/21 09:30:12 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -104,6 +104,7 @@ mediaCheck(Option opt)
 #define RELNAME_PROMPT	"Please specify the release you wish to load:"
 #define BPKG_PROMPT	"Please specify the name of the HTML browser package:"
 #define BBIN_PROMPT	"Please specify a full pathname to the HTML browser binary:"
+#define EDITOR_PROMPT	"Please specify the name of the text editor you wish to use:"
 #define RETRY_PROMPT	"Please specify the number of times to retry an FTP request:"
 #define PKG_PROMPT	"Please specify a temporary directory with lots of free space:"
 
@@ -122,6 +123,8 @@ static Option Options[] = {
       OPT_IS_VAR,	RETRY_PROMPT,		VAR_FTP_RETRIES,	varCheck	},
 { "FTP username",	"Username and password to use instead of anonymous",
       OPT_IS_FUNC,	mediaSetFtpUserPass,	VAR_FTP_USER,		varCheck	},
+{ "Editor",		"Which text editor to use during installation",
+      OPT_IS_VAR,	EDITOR_PROMPT,		VAR_EDITOR,		varCheck	},
 { "Tape Blocksize",	"Tape media block size in 512 byte blocks",
       OPT_IS_VAR,	TAPE_PROMPT,		VAR_TAPE_BLOCKSIZE,	varCheck	},
 { "Extract Detail",	"How verbosely to display file name information during extractions",
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 01eb68b..9a91d87 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.46 1996/03/18 15:28:06 jkh Exp $
+ * $Id: sysinstall.h,v 1.47 1996/03/21 09:30:15 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -108,6 +108,7 @@
 #define VAR_DISK			"disk"
 #define VAR_DISKSPACE			"diskSpace"
 #define VAR_DOMAINNAME			"domainname"
+#define VAR_EDITOR			"editor"
 #define VAR_EXTRAS			"ifconfig_"
 #define VAR_FTP_ONERROR			"ftpOnError"
 #define VAR_FTP_PASS			"ftpPass"