@@ -240,10 +240,12 @@
       (if (not (setup-for-run))
 	  (begin 
 	    (debug:print 0 print "Failed to setup, exiting")
 	    (exit 1)))
       (set! db (open-db))
+      (if (not (args:get-arg "-server"))
+	  (server:client-setup db))
       (if (not (car *configinfo*))
 	  (begin
 	    (debug:print 0 "ERROR: Attempted to remove test(s) but run area config file not found")
 	    (exit 1))
 	  ;; put test parameters into convenient variables
@@ -275,10 +277,12 @@
 	   (runsdat  (rdb:get-runs db runpatt #f #f '()))
 	   (runs     (db:get-rows runsdat))
 	   (header   (db:get-header runsdat))
 	   (keys     (rdb:get-keys db))
 	   (keynames (map key:get-fieldname keys)))
+      (if (not (args:get-arg "-server"))
+	  (server:client-setup db))
       ;; Each run
       (for-each 
        (lambda (run)
 	 (debug:print 2 "Run: "
 		(string-intersperse (map (lambda (x)
@@ -440,10 +444,12 @@
 	  (if (not (setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, giving up on -test-paths, exiting")
 		(exit 1)))
 	  (set! db (open-db))    
+	  (if (not (args:get-arg "-server"))
+	      (server:client-setup db))
 	  (let* ((itempatt (args:get-arg "-itempatt"))
 		 (keys     (rdb:get-keys db))
 		 (keynames (map key:get-fieldname keys))
 		 (paths    (db:test-get-paths-matching db keynames target)))
 	    (set! *didsomething* #t)
@@ -487,11 +493,13 @@
 		(exit 1)))
 	  (if (not (setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, giving up on -archive, exiting")
 		(exit 1)))
-	  (set! db (open-db))    
+	  (set! db (open-db))   
+	  (if (not (args:get-arg "-server"))
+	      (server:client-setup db))
 	  (let* ((itempatt (args:get-arg "-itempatt"))
 		 (keys     (rdb:get-keys db))
 		 (keynames (map key:get-fieldname keys))
 		 (paths    (db:test-get-paths-matching db keynames target)))
 	    (set! *didsomething* #t)
@@ -559,10 +567,12 @@
 	  (if (not (setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 	  (set! db (open-db))
+	  (if (not (args:get-arg "-server"))
+	      (server:client-setup db))
 	  (if (and state status)
 	      (rdb:teststep-set-status! db run-id test-name step state status itemdat (args:get-arg "-m") logfile)
 	      (begin
 		(debug:print 0 "ERROR: You must specify :state and :status with every call to -step")
 		(exit 6)))
@@ -595,10 +605,12 @@
 	  (if (not (setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 	  (set! db (open-db))
+	  (if (not (args:get-arg "-server"))
+	      (server:client-setup db))
 	  (if (args:get-arg "-load-test-data")
 	      (db:load-test-data db run-id test-name itemdat))
 	  (if (args:get-arg "-setlog")
 	      (test-set-log! db run-id test-name itemdat (args:get-arg "-setlog")))
 	  (if (args:get-arg "-set-toplog")
@@ -633,11 +645,13 @@
 		    (change-directory startingdir)
 		    (set! exitstat (system fullcmd)) ;; cmd params))
 		    (set! *globalexitstatus* exitstat)
 		    (change-directory testpath)
 		    ;; re-open the db
-		    (set! db (open-db)) 
+		    (set! db (open-db))
+		    (if (not (args:get-arg "-server"))
+			(server:client-setup db))
 		    ;; run logpro if applicable ;; (process-run "ls" (list "/foo" "2>&1" "blah.log"))
 		    (if logprofile
 			(let* ((htmllogfile (conc stepname ".html"))
 			       (oldexitstat exitstat)
 			       (cmd         (string-intersperse (list "logpro" logprofile htmllogfile "<" logfile ">" (conc stepname "_logpro.log")) " ")))
@@ -686,10 +700,12 @@
       (if (not (setup-for-run))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting")
 	    (exit 1)))
       (set! db (open-db))
+      (if (not (args:get-arg "-server"))
+	  (server:client-setup db))
       (set! keys (rdb:get-keys db))
       (debug:print 1 "Keys: " (string-intersperse (map key:get-fieldname keys) ", "))
       (sqlite3:finalize! db)
       (set! *didsomething* #t)))
 
@@ -725,10 +741,12 @@
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       ;; now can find our db
       (set! db (open-db))
+      (if (not (args:get-arg "-server"))
+	  (server:client-setup db))
       (runs:update-all-test_meta db)
       (sqlite3:finalize! db)
       (set! *didsomething* #t)))
 
 ;;======================================================================
@@ -738,17 +756,20 @@
     (let* ((toppath (setup-for-run))
 	   (db      (if toppath (open-db) #f)))
       (if db
 	  (begin
 	    (set! *db* db)
+	    (if (not (args:get-arg "-server"))
+		(server:client-setup db))
 	    (import readline)
 	    (import apropos)
 	    (gnu-history-install-file-manager
 	     (string-append
 	      (or (get-environment-variable "HOME") ".") "/.megatest_history"))
 	    (current-input-port (make-gnu-readline-port "megatest> "))
-	    (repl)))))
+	    (repl)))
+      (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Exit and clean up
 ;;======================================================================