Changeset 644 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.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/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf

@@ -479 +479 @@
 // fails miserably if there are aliases in the UP folder, although
 // the #include doesn't mind
+//
+// SRK -2010- I need to look in the special directory too (look there first)
+//
 Function CheckFileInUPFolder(fileStr)
         String fileStr
@@ -490 +493 @@
         fileStr = RemoveExten(fileStr)+fileVerExt
         
+        // the Igor 6.1 User Procedure Path, same sub-folders as in Igor App Folder
+        // the installer MOVES items here, so no troubles with aliases
+        String userPathStr=RemoveEnding(SpecialDirPath("Igor Pro User Files",0,0,0),":")+":"
+        String UPStr=userPathStr+"User Procedures:"
+        NewPath /O/Q/Z UPPath ,UPStr
+        ListAllFilesAndFolders("UPPath",1,1,0)  //this sets the global string allFiles
+        String list = allFiles
+        err = strsearch(list, fileStr, 0,2)             //this is not case-sensitive, but Igor 5!
+        if(err != -1)
+                return(1)               //name was found somewhere
+        endif
+        
+        // name not found, try looking in the Igor Pro/ folder
+        // this will still fail if aliases are present here
         PathInfo Igor
-        String UPStr=S_path+"User Procedures:"
+        UPStr=S_path+"User Procedures:"
         NewPath /O/Q/Z UPPath ,UPStr
-        ListAllFilesAndFolders("UPPath",1,1,0)  //this sets allFiles
-        String list = allFiles
+        ListAllFilesAndFolders("UPPath",1,1,0)  //this sets the global string allFiles
+        list = allFiles
 //      err = FindListItem(fileStr, list ,";" ,0)
         err = strsearch(list, fileStr, 0,2)             //this is not case-sensitive, but Igor 5!