Changeset 644 for sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/CheckVersionFTP.ipf

Timestamp:

Mar 19, 2010 11:55:53 AM (13 years ago)

Author:

srkline

Message:

Tweaks for the installer.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/CheckVersionFTP.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/CheckVersionFTP.ipf

@@ -2 +2 @@
 #pragma IgorVersion=6.1
 
-// goes to our ftp site and downloads "CurrentVersion.txt"
+// goes to our ftp site and downloads "CurrentVersion.txt", puts this in "Packages"
+// in the WM preferences folder. I can write to it here, and it won't mess with any install
 //
 // compares to the installed version string, which is installed in UP:NCNR_UP
@@ -40 +41 @@
         fileNameStr = IgorPathStr + "User Procedures:NCNR_User_Procedures:InstalledVersion.txt"
         
+        // the Igor 6.1 User Procedure Path, same sub-folders as in Igor App Folder
+        String userPathStr=RemoveEnding(SpecialDirPath("Igor Pro User Files",0,0,0),":")+":"
+        
+        // try the UP folder in the Igor Pro folder (older installations)
         Open/R/Z refNum as fileNameStr
         if(V_flag != 0)
-                //couldn't find the file, send user to web site to update
-                sprintf str,"I could not determine what version of the SANS Macros you are running."
+                //then try the special user directory (for 6.1+ installations)
+                Open/R/Z refNum as userPathStr
+                if(V_flag != 0)
+                        //couldn't find the file, send user to web site to update
+                        sprintf str,"I could not determine what version of the SANS Macros you are running."
+                        str += " You need to go to the NCNR website for the latest version. Do you want to go there now?"
+                        DoAlert 1,str
+                        if(V_flag==1)
+                                BrowseURL "http://www.ncnr.nist.gov/programs/sans/data/red_anal.html"
+                        endif
+                        //don't need to close if nothing was opened (/Z)
+                        
+                        return          //couldn't find either file, nothing opened, exit
+                endif
+        endif
+        
+        // the file was opened, check the version
+        FReadLine refNum, installedStr
+        Close refnum
+        
+        Print "Installed = ",installedStr       
+        
+        runningVersion = NumberByKey(StringFromList(0,"PACKAGE_VERSION"), installedStr,"=",";")
+        upToDateVersion = NumberByKey(StringFromList(0,"PACKAGE_VERSION"), currentStr,"=",";")
+        
+        If(runningVersion != upToDateVersion)
+                sprintf str,"You are running version %g and the latest version is %g.",runningVersion,upToDateVersion
                 str += " You need to go to the NCNR website for the latest version. Do you want to go there now?"
                 DoAlert 1,str
@@ -49 +79 @@
                         BrowseURL "http://www.ncnr.nist.gov/programs/sans/data/red_anal.html"
                 endif
-                //don't need to close if nothing was opened (/Z)
         else
-        
-                FReadLine refNum, installedStr
-                Close refnum
-                
-                Print "Installed = ",installedStr       
-                
-                runningVersion = NumberByKey(StringFromList(0,"PACKAGE_VERSION"), installedStr,"=",";")
-                upToDateVersion = NumberByKey(StringFromList(0,"PACKAGE_VERSION"), currentStr,"=",";")
-                
-                If(runningVersion != upToDateVersion)
-                        sprintf str,"You are running version %g and the latest version is %g.",runningVersion,upToDateVersion
-                        str += " You need to go to the NCNR website for the latest version. Do you want to go there now?"
-                        DoAlert 1,str
-                        if(V_flag==1)
-                                BrowseURL "http://www.ncnr.nist.gov/programs/sans/data/red_anal.html"
-                        endif
-                else
-                        DoAlert 0,"You are running the most up-to-date version = "+StringByKey(StringFromList(0,"PACKAGE_VERSION"), currentStr,"=",";")
-                endif
+                DoAlert 0,"You are running the most up-to-date version = "+StringByKey(StringFromList(0,"PACKAGE_VERSION"), currentStr,"=",";")
         endif
         
+        return
 End