Changeset 151 for trunk/lingosource/castlib1/bbedit_Utilities.ls

Timestamp:

02/19/08 13:54:27 (4 years ago)

Author:

alex

Message:

fixed problems with compare scripts, when there were not enough permissions on mac osx

File:

• trunk/lingosource/castlib1/bbedit_Utilities.ls (modified) (7 diffs)

trunk/lingosource/castlib1/bbedit_Utilities.ls

@@ -108 +108 @@
           ---------------------
           -- create a temporary file from scripttext:
-          -- tempSrcPath = shell_cmd_list("mktemp -t temp_BBEdit_file.ls")
-          -- tempSrcPath = tempSrcPath[1]
-          tempSrcPath = "/tmp/temp_BBEdit_file.ls"
-          
-          --          tempSrcHFSPath = mDoShellCmd(me, "osascript -e" && QUOTE & "return POSIX file \" & QUOTE & tempSrcPath & "\" & QUOTE & " as string" & QUOTE, 1)
-          --  tempSrcHFSPath = tempSrcHFSPath[1]
-          tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
+          tempSrcHFSPath = mGetTempFilePath(me, "temp_BBEdit_file.ls")
+          tempSrcPath = mConvertHfs2Unix(me, tempSrcHFSPath)
           
           
@@ -120 +115 @@
           ---------------------
           
-          mDoShellCmd(me, "bbedit --wait --resume " & tempSrcPath)
-          
-          theText = mGetTextFromFile(me, tempSrcHFSPath)
-          
-          if theType = #script then
-            memref.scripttext = theText
-          else if theType = #text then
-            memref.html = theText
-          else if theType = #field then
-            memref.text = theText
+          if theResult = 0 then
+            alert "Unable to save file:" && tempSrcHFSPath
+          else
+            mDoShellCmd(me, "bbedit --wait --resume " & tempSrcPath)
+            
+            theText = mGetTextFromFile(me, tempSrcHFSPath)
+            
+            if length(theText) < 1 then
+              alert "Something seems wrong: the length of the new text is 0, nating changed. If this was puprosely an empty text, please delete by hand."
+            else
+              if theType = #script then
+                memref.scripttext = theText
+              else if theType = #text then
+                memref.html = theText
+              else if theType = #field then
+                memref.text = theText
+              end if
+            end if
           end if
-          
           
         else
@@ -139 +141 @@
             theName = "member_" & memref.membernum & "_" & memref.castlibnum
           end if
-          ---------------------
-          -- create a temporary file from scripttext:
-          if mCheckForXtra(me, "BudAPI") then
-            
-            resetUNames = 0
-            if baSysFolder("prefs") starts "/" then
-              baReturnUnixNames(0)
-              resetUNames = 1
-            end if
-            tempSrcHFSPath = basysfolder("temp") & theName & ".ls"
-            baReturnUnixNames(1)
-            tempSrcPath = basysfolder("temp") & theName & ".ls"
-            if resetUNames = 0 then
-              baReturnUnixNames(0)
-            end if  
-          else
-            tempSrcPath = "/tmp/" & theName & ".ls"
-            tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
-          end if
+          
+          tempSrcPath = mGetTempFilePath(me, theName & ".ls")
+          tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
           
           
@@ -356 +342 @@
       end if
       
-      if not(the platform contains "mac") then
-        if mCheckForXtra(me, "BudAPI") then
-          tempSrcPath = basysfolder("temp")
-          put theName & ".ls" after tempSrcPath
-        else
-          alert "You need the buddyApi xtra for this operation"
-          exit
-        end if
-      else
-        delim = the last char of the moviepath
-        olddelim = the itemdelimiter
-        the itemdelimiter = delim
-        hd = item 1 of getosdirectory()
-        
-        tempSrcPath = hd & delim & "tmp" & delim & theName & ".ls"
-        the itemdelimiter = olddelim
-      end if
+      tempSrcPath = mGetTempFilePath(me, theName & ".ls")
       
       theText = mGetTextFromFile(me, tempSrcPath)
@@ -642 +612 @@
   ---------------------
   -- create a temporary file from scripttext:
-  --  tempSrcPath = shell_cmd_list("mktemp -t temp_BBDiff_file1")
-  --  tempSrcPath = tempSrcPath[1]
-  tempSrcPath = "/tmp/temp_BBDiff_file1.ls"
-  
-  -- tempSrcHFSPath = mDoShellCmd(me, "osascript -e" && QUOTE & "return POSIX file \" & QUOTE & tempSrcPath & "\" & QUOTE & " as string" & QUOTE, 1)
-  -- tempSrcHFSPath = tempSrcHFSPath[1]
-  tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
+  
+  tempSrcHFSPath = mGetTempFilePath(me, "temp_BBDiff_file1.ls")
+  tempSrcPath = mConvertHfs2unix(me, tempSrcHFSPath)
   
   st1 = memref1.scripttext
   theResult = mSaveTextToTempFile(me, st1, tempSrcHFSPath)
+  
+  if theResult = 0 then
+    alert "Problems saving file:" && tempSrcHFSPath && "Can't proceed"
+    exit
+  end if
   ---------------------
   
@@ -670 +641 @@
     ---------------------
     -- create a temporary file from scripttext:
-    --    tempSrcPath2 = shell_cmd_list("mktemp -t temp_BBDiff_file2")
-    --    tempSrcPath2 = tempSrcPath2[1]
-    tempSrcPath2 = "/tmp/temp_BBDiff_file2.ls"
-    
-    -- tempSrcHFSPath2 = mDoShellCmd(me, "osascript -e" && QUOTE & "return POSIX file \" & QUOTE & tempSrcPath2 & "\" & QUOTE & " as string" & QUOTE, 1)
-    -- tempSrcHFSPath2 = tempSrcHFSPath2[1]
-    tempSrcHFSPath2 = mConvertUnix2Hfs(me, tempSrcPath2)
+    tempSrcHFSPath2 = mGetTempFilePath(me, "temp_BBDiff_file2.ls")
+    tempSrcPath2 = mConvertHfs2unix(me, tempSrcHFSPath2)
     
     comm = tempSrcPath2
     
     theResult = mSaveTextToTempFile(me, st2, tempSrcHFSPath2)
+    if theResult = 0 then
+      alert "Problems saving file:" && tempSrcHFSPath && "Can't proceed"
+      exit
+    end if
     ---------------------
     
@@ -1411 +1381 @@
                     else
                       
-                      tempSrcPath = "/tmp/temp_BBEdit_file.ls"
-                      tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
+                      tempSrcHFSPath = mGetTempFilePath(me, "temp_BBEdit_file.ls")
+                      tempSrcPath = mConvertHfs2unix(me, tempSrcHFSPath)
                       
-                      mSaveTextToTempFile(me, memref.scripttext, tempSrcHFSPath)
+                      theResult = mSaveTextToTempFile(me, memref.scripttext, tempSrcHFSPath)
+                      if theResult <> 0 then
+                        
+                        if char 1 of comm = "~" then put "$HOME" into char 1 of comm
+                        
+                        mDoShellCmd(me, bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &QUOTE)
+                        
+                        newscripttext = mGetTextFromFile(me, tempSrcHFSPath)
+                        if length(newscripttext) then
+                          memref.scripttext = mGetTextFromFile(me, tempSrcHFSPath)
+                        else
+                          alert "Something seems wrong: the length of the new text is 0, nothing was changed now. If this was puprosely an empty text, please delete by hand."
+                        end if
+                        
+                      end if
                       
-                      if char 1 of comm = "~" then put "$HOME" into char 1 of comm
-                      
-                      mDoShellCmd(me, bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &QUOTE)
-                      
-                      memref.scripttext = mGetTextFromFile(me, tempSrcHFSPath)
                       
                     end if