Changeset 1167

Timestamp:

08/18/2011 03:06:58 AM (19 months ago)

Author:

toby

Message:

revised update for sandbox

File:

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

branches/sandbox/gsascmds.tcl

@@ -3801 +3801 @@
             forknewterm "manually update in subversion" \
                 "$SVN update [file normalize $::expgui(gsasdir)]"
+            forknewterm "manually update in subversion" \
+                "$SVN update [file normalize $::expgui(scriptdir)]"
         }
         return
      } else {
+        if {[string first "*" $res] == -1} {
+            catch {set res [eval exec $SVN status [list $::expgui(scriptdir)] -u]} err
+        }
         if {[string first "*" $res] == -1} {
             MyMessageBox -parent . -title "No updates" \
@@ -3824 +3829 @@
     # special upgrade for windows, where the wish exec blocks upgrade of the exe directory
     if {$::tcl_platform(platform) == "windows" && $::tcl_platform(os) != "Windows 95"} {
-        if {![file exists [file join $::expgui(gsasdir) update.bat]]} {
-            MyMessageBox -parent . -title "No update.bat" \
-                -message "File update.bat was not found. This should not happen. Will try to create it now." 
-            set fp [open [file join $::expgui(gsasdir) update.bat] w]
-            puts $fp {@REM this script must be run from the GSAS installation directory
+        set fp [open [file join $::expgui(gsasdir) selfupdate.bat] w]
+        puts $fp {@REM this script must be run from the GSAS installation directory
 @REM This is run to update the installation, the name of the EXP file is 
 @REM expected as an argument
@@ -3837 +3839 @@
 .\svn\bin\svn cleanup .
 .\svn\bin\svn update .
-@if (%1)==() goto Install2
+}
+        puts $fp ".\svn\bin\svn cleanup $expgui(scriptdir)"
+        puts $fp ".\svn\bin\svn update $expgui(scriptdir)"
+        puts $fp {@if (%1)==() goto Install2
 @echo ****************************************************
 @echo Update has completed. Press return to restart EXPGUI
@@ -3851 +3856 @@
 %COMSPEC% /c "start exe\ncnrpack.exe expgui\expgui"
 exit
-            }
-            close $fp
-        }
+        }
+        close $fp
         # split the directory and EXP file and get rid os spaces in the directory name
         set exp [file normalize $::expgui(expfile)]
@@ -3859 +3863 @@
         cd $::expgui(gsasdir)
         #run the batch file
-        exec $::env(COMSPEC) /c {start .\update.bat [file join $dir [file tail $exp]]} &
+        exec $::env(COMSPEC) /c {start .\selfupdate.bat [file join $dir [file tail $exp]]} &
         exit
     }
@@ -3869 +3873 @@
             -icon error
     }
+    # do a quiet cleanup. Sometimes needed after install, and never hurts
+    if [catch {set res [eval exec $SVN cleanup [list $::expgui(scriptdir)]]} err] {
+        MyMessageBox -parent . -title "Error in cleanup" \
+            -message "Error performing cleanup. Will try to continue anyway. Error:\n$err" \
+            -icon error
+    }
     if [catch {set res [exec $SVN up $::expgui(gsasdir)]} 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] {
+        MyMessageBox -parent . -title "Error updating" \
+            -message "Error performing scriptdir update:\n$err" \
             -icon error
         return