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

Timestamp:

12/18/09 15:29:03 (2 years ago)

Author:

alex

Message:

enclosed path to svn application and editor application in quotes, because that fails otherwise, if the path has spaces. what a fun it is to be able to have spaces in file and foldernames... :-(

File:

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

trunk/lingosource/castlib1/bbedit_Utilities.ls

@@ -56 +56 @@
     clistr = "bbedit"
   else
-    clistr = editor
+    clistr = QUOTE & editor & QUOTE
   end if
   
@@ -580 +580 @@
   if doit = 1 then
     --    put bbdiffpath && QUOTE & tempSrcPath & QUOTE && QUOTE & tempTgtPath & QUOTE
-    mDoShellCmd(me, bbdiffpath && QUOTE & tempSrcPath & QUOTE && QUOTE & tempTgtPath & QUOTE)
+    
+    mDoShellCmd(me, QUOTE & bbdiffpath & QUOTE && QUOTE & tempSrcPath & QUOTE && QUOTE & tempTgtPath & QUOTE)
     
   else
@@ -689 +690 @@
     end if
     
-    mDoShellCmd(me, bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &QUOTE)
+    mDoShellCmd(me, QUOTE & bbdiffpath & QUOTE & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &QUOTE)
     
     -- since we used the --wait and the --resume switch, we will only come to this line AFTER the diff process in bbedit is finished
@@ -856 +857 @@
     
     
-    theResult = mDoShellCmd(me, bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& mConvertHFS2Unix(me, fname1) &QUOTE&&QUOTE& mConvertHFS2Unix(me, fname2) &QUOTE && "2>&1", RETURN, 0, 1)
+    theResult = mDoShellCmd(me, QUOTE & bbdiffpath & QUOTE & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& mConvertHFS2Unix(me, fname1) &QUOTE&&QUOTE& mConvertHFS2Unix(me, fname2) &QUOTE && "2>&1", RETURN, 0, 1)
     
     -- since we used the --wait and the --resume switch, we will only come to this line AFTER the diff process in bbedit is finished
@@ -1412 +1413 @@
                         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)
+                        mDoShellCmd(me, QUOTE & bbdiffpath & QUOTE & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &QUOTE)
                         
                         newscripttext = mGetTextFromFile(me, tempSrcHFSPath)