From 26a4bca1b619100ed89a018b091e4ea0db4ce629 Mon Sep 17 00:00:00 2001
From: Eli Barzilay <eli@racket-lang.org>
Date: Thu, 11 Jan 2007 20:46:02 +0000
Subject: [PATCH] handin-client disabled by default

svn: r5315
---
 collects/handin-client/client-gui.ss |  5 ++---
 collects/handin-client/info.ss       | 26 ++++++++++++++++----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/collects/handin-client/client-gui.ss b/collects/handin-client/client-gui.ss
index 42961afe32..6082008c44 100644
--- a/collects/handin-client/client-gui.ss
+++ b/collects/handin-client/client-gui.ss
@@ -9,11 +9,10 @@
 
   (define uninstalled? #f)
 
-  (define server:port
-    (#%info-lookup 'server:port (lambda () (getenv "PLT_HANDIN_SERVER_PORT"))))
+  (define server:port (#%info-lookup 'server:port (lambda () #f)))
   (define-values (server port-no)
     (if server:port
-      (let ([m (regexp-match #rx"^(.+):([0-9]+)$" server:port)])
+      (let ([m (regexp-match #rx"^([^:]+):([0-9]+)$" server:port)])
         (unless m
           (error 'handin-client
                  "Bad configuration ~s, expecting \"server:port\""
diff --git a/collects/handin-client/info.ss b/collects/handin-client/info.ss
index 494995d457..9c166783c2 100644
--- a/collects/handin-client/info.ss
+++ b/collects/handin-client/info.ss
@@ -1,9 +1,19 @@
 (module info (lib "infotab.ss" "setup")
-  ;; Modify these definitions to customize the tool.
-  ;; Also replace the "icon.png" and "server-cert.pem" files.
-  ;; Instead of uncommenting the definition of server:port, you
-  ;; can set the PLT_HANDIN_SERVER_PORT environment variable.
+  ;; Modify these definitions to enable & customize the tool.
+  ;; (Detailed instructions are in the handin-server collection's doc.txt)
+  ;; Also replace the "server-cert.pem" files.
+
+  ;; Your course name (used for menus, button label, collection name etc)
   (define name "Course")
+
+  ;; The handin tool is disabled by default, uncomment these three lines to
+  ;; enable it
+  (define tools      `("client-gui.ss"))
+  (define tool-names `(,name))
+  (define tool-icons `("icon.png"))
+  ;; Modify the provided "icon.png" file to your school/lab/etc logo.
+
+  ;; You must define a server:port for the client to be functional
   ;(define server:port "localhost:7979")
 
   ;; The following are optional. Uncomment and fill in
@@ -13,12 +23,6 @@
   ;(define web-menu-name "Course Homepage")
   ;(define web-address "http://www.university.edu/course/")
 
-  (define tools      `("client-gui.ss"))
-  (define tool-names `(,name))
-  (define tool-icons `("icon.png"))
-
-  (define requires '(("mred") ("openssl")))
-
   ;; Auto-updater section (see handin-server/doc.txt for details)
   ;(define enable-auto-update #t) ; enable auto-update?
   ;(define version-filename "handin-version")
@@ -30,4 +34,6 @@
   ;(define selection-default ; suffixes to auto-choose (string or string-list)
   ;  '("*.scm;*.ss" "*.scm;*.ss;*.txt"))
 
+  (define requires '(("mred") ("openssl")))
+
   )