Changeset 22 for trunk

Timestamp:

Dec 4, 2009 4:59:03 PM (14 years ago)

Author:

toby

Message:

# on 1999/01/07 04:45:54, toby did:
remove compressprog -- not used

move definition of environment variables so they are defined at runtime

move xterm errors to catch statement

File:

• trunk/gsascmds.tcl (modified) (4 diffs, 3 props)

trunk/gsascmds.tcl

@@ -9 +9 @@
         destroy .
     }
-    # this is a compress program used for archiving of .EXP files
-    set compressprog "pkzip -m"
     if {$tcl_platform(os) == "Windows 95" || $tcl_platform(os) == "Windows 98" } {
         proc forknewterm {title command "background 0" "scrollbar 1" "wait 1"} {
-            global expgui
+            global env expgui
+            # Windows environment variables
+            # -95 does not seem to be able to use these
+            set env(GSAS) [file nativename $expgui(gsasexe)]
+            # PGPLOT_FONT is needed by PGPLOT
+            set env(PGPLOT_FONT) [file nativename [file join $expgui(gsasdir) fonts grfont.dat]]
+            # this is the number of lines/page in the .LST (etc.) file
+            set env(LENPAGE) 60
             set pwd [file nativename [pwd]]
 
@@ -42 +47 @@
         # now for - brain-dead Windows-NT
         proc forknewterm {title command "background 0" "scrollbar 1" "wait 1"} {
-            # all winexec commands are background commands -- ignore background
+            global env expgui
+            # Windows environment variables
+            # -95 does not seem to be able to use these
+            set env(GSAS) [file nativename $expgui(gsasexe)]
+            # PGPLOT_FONT is needed by PGPLOT
+            set env(PGPLOT_FONT) [file nativename [file join $expgui(gsasdir) fonts grfont.dat]]
+            # this is the number of lines/page in the .LST (etc.) file
+            set env(LENPAGE) 60
+            # all winexec commands are background commands -- ignore background arg
 
             # can't get pause to work! -- ignore wait
@@ -58 +71 @@
             }
         }
-        # Windows environment variables
-        # -95 does not seem to be able to use these
-        set env(GSAS) [file nativename $expgui(gsasexe)]
-        # PGPLOT_FONT is needed by PGPLOT
-        set env(PGPLOT_FONT) [file nativename [file join $expgui(gsasdir) fonts grfont.dat]]
+    }
+} else {
+    if [catch {set env(GSASBACKSPACE)}] {set env(GSASBACKSPACE) 1}
+
+    proc forknewterm {title command "background 0" "scrollbar 1" "wait 1"} {
+        global env expgui
+        # UNIX environment variables
+        set env(GSASEXE) $expgui(gsasexe)
+        set env(ATOMDATA) [file join $expgui(gsasdir) data atmdata.dat]
+        set env(ATMXSECT) [file join $expgui(gsasdir) data atmxsect.dat]
+        # PGPLOT_DIR is needed by PGPLOT
+        set env(PGPLOT_DIR) [file join $expgui(gsasdir) pgl]
         # this is the number of lines/page in the .LST (etc.) file
         set env(LENPAGE) 60
-    }
-} else {
-    # UNIX environment variables
-    set env(GSASEXE) $expgui(gsasexe)
-    set env(ATOMDATA) [file join $expgui(gsasdir) data atmdata.dat]
-    set env(ATMXSECT) [file join $expgui(gsasdir) data atmxsect.dat]
-    # PGPLOT_DIR is needed by PGPLOT
-    set env(PGPLOT_DIR) [file join $expgui(gsasdir) pgl]
-    # this is the number of lines/page in the .LST (etc.) file
-    set env(LENPAGE) 60
-    if [catch {set env(GSASBACKSPACE)}] {set env(GSASBACKSPACE) 1}
-
-    # this is a compress program used for archiving of .EXP files
-    set compressprog gzip
-    proc forknewterm {title command "background 0" "scrollbar 1" "wait 1"} {
-        global env
         set termopts {}
         if $env(GSASBACKSPACE) {
@@ -101 +105 @@
         }
         if !$background {wm iconify .}
-        eval exec xterm $termopts -title [list $title] \
-                -e /bin/sh -c [list $command] $suffix
+        catch {eval exec xterm $termopts -title [list $title] \
+                -e /bin/sh -c [list $command] $suffix} errmsg
+        if $expgui(debug) {puts "xterm result = $errmsg"}
         if !$background {wm deiconify .}
     }