Changeset 995

Timestamp:

Aug 18, 2010 6:05:07 PM (11 years ago)

Author:

toby

Message:

more space in dir changes

Location:

trunk

Files:

• expgui (modified) (1 diff)
• gsascmds.tcl (modified) (5 diffs)

trunk/expgui

@@ -282 +282 @@
         update
         MyMessageBox -parent . -title "Good luck..." \
-            -message "You are using a directory with a space in the name ([file dirname $expgui(expfile)]) -- You may encounter bugs in EXPGUI. Please e-mail them to Brian.Toby@ANL.gov so they can be fixed." \
+            -message "You are using a directory with a space in the name ([file dirname $expgui(expfile)]) -- You may encounter bugs in EXPGUI, which are being corrected as reported. Please e-mail them to Brian.Toby@ANL.gov so they can be fixed." \
                 -icon warning -type Continue -default continue
 #               -helplink "expguierr.html OpenErr"

trunk/gsascmds.tcl

@@ -3250 +3250 @@
     if {[auto_execok svn] != ""} {return 1}
     # add a locally supplied svn version, if not in the path already
-    set pathlist "[file join $scriptdir svn bin]"
+    set pathlist [list [file join $scriptdir svn bin]]
     lappend pathlist "/sw/bin/"
     lappend pathlist "/opt/local/bin/"
@@ -3273 +3273 @@
 
 proc GetSVNVersion {scriptdir} {
-    set SVN [auto_execok svn]
+    if {$::tcl_platform(platform) == "windows"} {
+        set SVN [file attributes [lindex [auto_execok svn] 0] -shortname]
+    } else {
+        set SVN [auto_execok svn]
+    }
     if {$SVN != ""} {
         if {! [catch {set res [exec $SVN info $scriptdir]} err]} {
@@ -3285 +3289 @@
 
 proc GetSVNrepository {scriptdir} {
-    set SVN [auto_execok svn]
+    if {$::tcl_platform(platform) == "windows"} {
+        set SVN [file attributes [lindex [auto_execok svn] 0] -shortname]
+    } else {
+        set SVN [auto_execok svn]
+    }
     if {$SVN != ""} {
         if {! [catch {set res [exec $SVN info $scriptdir]} err]} {
@@ -3299 +3307 @@
     # reset the track label
     set ::command(SVNversion) [lindex [split [GetSVNrepository $::expgui(scriptdir)] '/'] end]
-    set SVN [auto_execok svn]
+    if {$::tcl_platform(platform) == "windows"} {
+        set SVN [file attributes [lindex [auto_execok svn] 0] -shortname]
+    } else {
+        set SVN [auto_execok svn]
+    }
     if {$SVN == ""} {
         return 0
@@ -3348 +3360 @@
 
 proc CheckAndDoUpdate { } {
-    set SVN [auto_execok svn]
+    if {$::tcl_platform(platform) == "windows"} {
+        set SVN [file attributes [lindex [auto_execok svn] 0] -shortname]
+    } else {
+        set SVN [auto_execok svn]
+    }
     if {$SVN == ""} {
         tk_dialog .msg "Error: no svn" \