@@ -102,23 +102,23 @@
 	"unknown"
 	(caar uname-res))))
 	      
 (define (save-environment-as-files fname)
   (let ((envvars (get-environment-variables))
-        (whitesp (regexp "[^a-zA-Z0-9_\\-:;,.\\/%]")))
+        (whitesp (regexp "[^a-zA-Z0-9_\\-:;,.\\/%$]")))
      (with-output-to-file (conc fname ".csh")
        (lambda ()
           (for-each (lambda (key)
                       (let* ((val (cdr key))
-                             (sval (if (string-search whitesp val)(conc "'" val "'") val)))
+                             (sval (if (string-search whitesp val)(conc "\"" val "\"") val)))
                         (print "setenv " (car key) " " sval)))
                      envvars)))
      (with-output-to-file (conc fname ".sh")
        (lambda ()
           (for-each (lambda (key)
                       (let* ((val (cdr key))
-                             (sval (if (string-search whitesp val)(conc "'" val "'") val)))
+                             (sval (if (string-search whitesp val)(conc "\"" val "\"") val)))
                          (print "export " (car key) "=" sval)))
                     envvars)))))
 
 ;; set some env vars from an alist, return an alist with original values
 ;; (("VAR" "value") ...)