From 34c4947ee9aa2d2ebcaa1955e96843f5c6e6021a Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 28 Sep 1996 18:29:33 +0000
Subject: [PATCH] Change defaults for configuration directories: the course
 material goes under "~u6001" but the working directory is in the user's home
 directory.  The directories are now all chosen when the editor is started
 rather than when the band is built.

---
 v7/src/6001/edextra.scm | 10 ++++++----
 v7/src/6001/make.scm    | 17 +++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/v7/src/6001/edextra.scm b/v7/src/6001/edextra.scm
index 770e95e4e..9a3a7c230 100644
--- a/v7/src/6001/edextra.scm
+++ b/v7/src/6001/edextra.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: edextra.scm,v 1.20 1995/02/24 00:37:35 cph Exp $
+$Id: edextra.scm,v 1.21 1996/09/28 18:29:33 cph Exp $
 
 Copyright (c) 1992-95 Massachusetts Institute of Technology
 
@@ -48,12 +48,14 @@ MIT in each case. |#
 	  (standard-login-initialization))))
 
 (define (standard-login-initialization)
+  (set! student-root-directory "~u6001/")
+  (set! student-work-directory "~/work/")
   (if (not (file-directory? student-root-directory))
       (set! student-root-directory (user-homedir-pathname)))
-  (set! student-work-directory
-	(merge-pathnames "work/" student-root-directory))
   (if (not (file-directory? student-work-directory))
-      (set! student-work-directory student-root-directory))
+      (set! student-work-directory (user-homedir-pathname)))
+  (set! pset-directory (merge-pathnames "psets/" student-root-directory))
+  (set! pset-list-file (merge-pathnames "probsets.scm" pset-directory))
   (set-default-directory student-work-directory)
   (set-working-directory-pathname! student-work-directory)
   (let ((hairy-floppy-stuff? (eq? 'UNIX microcode-id/operating-system)))
diff --git a/v7/src/6001/make.scm b/v7/src/6001/make.scm
index 0d3cbff03..4bfc32954 100644
--- a/v7/src/6001/make.scm
+++ b/v7/src/6001/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 15.24 1996/09/27 23:06:22 cph Exp $
+$Id: make.scm,v 15.25 1996/09/28 18:29:11 cph Exp $
 
 Copyright (c) 1991-95 Massachusetts Institute of Technology
 
@@ -60,17 +60,18 @@ MIT in each case. |#
 (set! user-initial-environment (->environment '(student)))
 
 (in-package (->environment '(edwin))
-  (set! student-root-directory (user-homedir-pathname))
-  (set! student-work-directory
-	(merge-pathnames "work/" student-root-directory))
-  (set! pset-directory (merge-pathnames "psets/" student-root-directory))
-  (set! pset-list-file (merge-pathnames "probsets.scm" pset-directory)))
+  ;; These defaults will be overridden when the editor is started.
+  (set! student-root-directory "~u6001/")
+  (set! student-work-directory "~/work/")
+  (set! pset-directory "~u6001/psets/")
+  (set! pset-list-file "~u6001/psets/probsets.scm"))
 
 (in-package (->environment '(student))
   (define u6001-dir
-    (let ((homedir (access student-root-directory (->environment '(edwin)))))
+    (let ((edwin (->environment '(edwin))))
       (lambda (filename)
-	(->namestring (merge-pathnames filename homedir)))))
+	(->namestring
+	 (merge-pathnames filename (access student-root-directory edwin))))))
   (define nil #f))
 
 (ge '(student))
\ No newline at end of file
-- 
2.25.1