@@ -2453,74 +2453,75 @@
          (exit 0)))
      
      (if (or (getenv "MT_RUNSCRIPT")
      	(args:get-arg "-repl")
      	(args:get-arg "-load"))
-         (let* ((toppath (launch:setup))
-     	   (dbstruct (if (and toppath
-			      #;(common:on-homehost?))
-			 (db:setup #f)
-			 #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
-           (if *toppath*
-     	  (cond
-     	   ((getenv "MT_RUNSCRIPT")
-     	    ;; How to run megatest scripts
-     	    ;;
-     	    ;; #!/bin/bash
-     	    ;;
-     	    ;; export MT_RUNSCRIPT=yes
-     	    ;; megatest << EOF
-     	    ;; (print "Hello world")
-     	    ;; (exit)
-     	    ;; EOF
-     
-     	    (repl))
-     	   (else
-     	    (begin
-     	      (set! *db* dbstruct)
-     	      ;; (import extras) ;; might not be needed
-     	      ;; (import csi)
-     	      ;; (import readline)
-     	      (import apropos
-		      archivemod
-		      commonmod
-		      configfmod
-		      dbmod
-		      debugprint
-		      ezstepsmod
-		      http-transportmod
-		      launchmod
-		      processmod
-		      rmtmod
-		      runsmod
-		      servermod
-		      tasksmod
-		      testsmod)
-
-	      (set-history-length! 300)
-	      
-	      (load-history-from-file ".megatest_history")
-	      
-	      (current-input-port (make-linenoise-port))
-     	      ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
-     
-     	;; (if *use-new-readline*
-     	;; 	  (begin
-     	;; 	    (install-history-file (get-environment-variable "HOME") ".megatest_history") ;;  [homedir] [filename] [nlines])
-     	;; 	    (current-input-port (make-readline-port "megatest> ")))
-     	;; 	  (begin
-     	;; 	    (gnu-history-install-file-manager
-     	;; 	     (string-append
-     	;; 	      (or (get-environment-variable "HOME") ".") "/.megatest_history"))
-     	;; 	    (current-input-port (make-gnu-readline-port "megatest> "))))
-     	      (if (args:get-arg "-repl")
-     		  (repl)
-     		  (load (args:get-arg "-load")))
-     	      ;; (db:close-all dbstruct) <= taken care of by on-exit call
-     	      )
-     	    (exit)))
-     	  (set! *didsomething* #t))))
+         (let* ((toppath (launch:setup)))
+		
+     	        ;; (dbstruct (if (and toppath
+		;; 	      #;(common:on-homehost?))
+		;; 	 (db:setup #f) ;; sets up main.db
+		;; 	 #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
+	   (if *toppath*
+	       (cond
+		((getenv "MT_RUNSCRIPT")
+		 ;; How to run megatest scripts
+		 ;;
+		 ;; #!/bin/bash
+		 ;;
+		 ;; export MT_RUNSCRIPT=yes
+		 ;; megatest << EOF
+		 ;; (print "Hello world")
+		 ;; (exit)
+		 ;; EOF
+		 
+		 (repl))
+		(else
+		 (begin
+		   ;; (set! *db* dbstruct)
+		   ;; (import extras) ;; might not be needed
+		   ;; (import csi)
+		   ;; (import readline)
+		   (import apropos
+			   archivemod
+			   commonmod
+			   configfmod
+			   dbmod
+			   debugprint
+			   ezstepsmod
+			   http-transportmod
+			   launchmod
+			   processmod
+			   rmtmod
+			   runsmod
+			   servermod
+			   tasksmod
+			   testsmod)
+		   
+		   (set-history-length! 300)
+		   
+		   (load-history-from-file ".megatest_history")
+		   
+		   (current-input-port (make-linenoise-port))
+		   ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
+		   
+		   ;; (if *use-new-readline*
+		   ;; 	  (begin
+		   ;; 	    (install-history-file (get-environment-variable "HOME") ".megatest_history") ;;  [homedir] [filename] [nlines])
+		   ;; 	    (current-input-port (make-readline-port "megatest> ")))
+		   ;; 	  (begin
+		   ;; 	    (gnu-history-install-file-manager
+		   ;; 	     (string-append
+		   ;; 	      (or (get-environment-variable "HOME") ".") "/.megatest_history"))
+		   ;; 	    (current-input-port (make-gnu-readline-port "megatest> "))))
+		   (if (args:get-arg "-repl")
+		       (repl)
+		       (load (args:get-arg "-load")))
+		   ;; (db:close-all dbstruct) <= taken care of by on-exit call
+		   )
+		 (exit)))
+	       (set! *didsomething* #t))))
      
      ;;======================================================================
      ;; Wait on a run to complete
      ;;======================================================================