Changeset 1216 for branches/sandbox/gsascmds.tcl

Timestamp:

Aug 19, 2012 9:10:44 AM (9 years ago)

Author:

toby

Message:

bring proxy support back to sandbox

File:

• branches/sandbox/gsascmds.tcl (modified) (6 diffs)

branches/sandbox/gsascmds.tcl

@@ -3790 +3790 @@
 
 proc CheckAndDoUpdate { } {
+    if [file exists [file join $::expgui(gsasdir) proxyinfo.txt]] {
+        set fp [open [file join $::expgui(gsasdir) proxyinfo.txt]]
+        gets $fp proxaddr
+        gets $fp proxport
+        set proxy "--config-option servers:global:http-proxy-host=$proxaddr"
+        set proxp "--config-option servers:global:http-proxy-port=$proxport"
+        close $fp
+    } else {
+        set proxy {}
+        set proxp {}
+    }
     pleasewait "... Checking with software repository..."
     if {! [CheckSVNinstalled]} {
@@ -3808 +3819 @@
     # check for updates
     set SVN [auto_execok svn]
-    if [catch {set res [eval exec $SVN status [list $::expgui(gsasdir)] -u]} err] {
+    if [catch {set res \
+                   [eval exec $SVN status [list $::expgui(gsasdir)] -u $proxy $proxp] \
+               } err] {
         donewait
         set ans [MyMessageBox -parent . -title "Error checking status" \
@@ -3815 +3828 @@
         if {$ans != "no"} {
             forknewterm "manually update in subversion" \
-                "$SVN update [file normalize $::expgui(gsasdir)]"
+                " \"$SVN update [file normalize $::expgui(gsasdir)] $proxy $proxp\""
             forknewterm "manually update in subversion" \
-                "$SVN update [file normalize $::expgui(scriptdir)]"
+                " \"$SVN update [file normalize $::expgui(scriptdir)] $proxy $proxp\""
         }
         return
      } else {
         if {[string first "*" $res] == -1} {
-            catch {set res [eval exec $SVN status [list $::expgui(scriptdir)] -u]} err
+            catch {set res \
+                       [eval exec $SVN status [list $::expgui(scriptdir)] -u $proxy $proxp]\
+                   } err
         }
         if {[string first "*" $res] == -1} {
@@ -3832 +3847 @@
         }
     }
-
+    set msg {
+Updates to GSAS/EXPGUI found on server.
+                 
+Press the "Update & Restart" button to begin the update process. After the update completes, EXPGUI will be restarted.}
+    if {$proxy != "" || $proxp != ""} {
+        append msg "\nUsing proxy settings \"$proxy\" and \"$proxp\""
+    }
     donewait
     if {[MyMessageBox -parent . -title "Ready to Update" \
-             -message {
-Updates to GSAS/EXPGUI found on server.
-                 
-Press the "Update & Restart" button to begin the update process. After the update completes, EXPGUI will be restarted.} \
+             -message $msg \
              -type {Cancel "Update & Restart"} -default cancel -icon warning
         ] == "cancel"} {return}
@@ -3855 +3873 @@
 @pause
 .\svn\bin\svn cleanup .
-.\svn\bin\svn update .
-}
+}
+        puts $fp ".\\svn\\bin\\svn update . $proxy $proxp"
         puts $fp ".\\svn\\bin\\svn cleanup $::expgui(scriptdir)"
-        puts $fp ".\\svn\\bin\\svn update $::expgui(scriptdir)"
+        puts $fp ".\\svn\\bin\\svn update $::expgui(scriptdir) $proxy $proxp"
         puts $fp {@if (%1)==() goto Install2
 @echo ****************************************************
@@ -3896 +3914 @@
             -icon error
     }
-    if [catch {set res [exec $SVN up $::expgui(gsasdir)]} err] {
+    if [catch {set res [exec $SVN up $::expgui(gsasdir) $proxy $proxp]} err] {
         MyMessageBox -parent . -title "Error updating" \
             -message "Error performing update:\n$err" \
             -icon error
         return
-    } elseif [catch {set res [exec $SVN up $::expgui(scriptdir)]} err] {
+    } elseif [catch {set res [exec $SVN up $::expgui(scriptdir) $proxy $proxp]} err] {
         MyMessageBox -parent . -title "Error updating" \
             -message "Error performing scriptdir update:\n$err" \