Changeset 242 for trunk/lingosource/castlib1/svn_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/svn_Utilities.ls (modified) (21 diffs)

trunk/lingosource/castlib1/svn_Utilities.ls

@@ -171 +171 @@
               comm = mConvertHFS2Unix(me, thePath)
               
-              theResult = mDoShellCmd(me, bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &QUOTE && "2>&1", RETURN, 0, 1)
+              theResult = mDoShellCmd(me, QUOTE & bbdiffpath & QUOTE & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &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
@@ -341 +341 @@
             bbeditBinary = mFindUnixAppInPath(me, "bbedit")
             if length(bbeditBinary) > 0 then
-              mDoShellCmd(me, bbeditBinary && QUOTE & mConvertHFS2Unix(me, thePath) & QUOTE)
+              mDoShellCmd(me, QUOTE & bbeditBinary & QUOTE && QUOTE & mConvertHFS2Unix(me, thePath) & QUOTE)
               exit
             end if
@@ -1534 +1534 @@
   
   if count(castlibList) < 1 then
-    theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolder & QUOTE, RETURN, 0, 1)
+    theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "update" && QUOTE & workingFolder & QUOTE, RETURN, 0, 1)
     
   else
@@ -1545 +1545 @@
       thePath = workingFolder & pdelim & "castlib" & num & pdelim
       
-      ret = mDoShellCmd(me, svnBinary && "update" && "-r" && revisionNumber && QUOTE & thePath & QUOTE, RETURN, 0, 1)
+      ret = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "update" && "-r" && revisionNumber && QUOTE & thePath & QUOTE, RETURN, 0, 1)
       if count(ret) > 0 then theresult.add(ret[1])
       
@@ -1735 +1735 @@
               end if
               
-              theresult = mDoShellCmd(me, svnBinary && "delete" && QUOTE & ufpath & QUOTE, RETURN, 0, 1)
+              theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "delete" && QUOTE & ufpath & QUOTE, RETURN, 0, 1)
               if count(theresult) < 1 then
                 put "failed to svn delete member " & memref & " no result from svn?!"
@@ -1795 +1795 @@
     end if
     
-    theresult = mDoShellCmd(me, svnBinary && "ci --message" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE, RETURN, 0, 1)
+    theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "ci --message" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE, RETURN, 0, 1)
     
     if count(theresult) > 0 then
@@ -1842 +1842 @@
 on mGetCurrentRevision me, svnBinary, WorkingFolder
   
-  versionNumber = mDoShellCmd(me, svnBinary && QUOTE & WorkingFolder & QUOTE, RETURN, 0, 1)
+  versionNumber = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && QUOTE & WorkingFolder & QUOTE, RETURN, 0, 1)
   if count(versionNumber) < 1 then return void
   versionNumber = versionNumber[1]
@@ -2127 +2127 @@
     mDisplayWaitStatusText me, "SVN update of:" && castlibList[r][3]
     
-    theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & castlibList[r][3] & QUOTE, RETURN, 0, 1)
+    theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "update" && QUOTE & castlibList[r][3] & QUOTE, RETURN, 0, 1)
     
     if count(theresult) < 1 then
-      theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & castlibList[r][3] & QUOTE && "2>&1", RETURN, 0, 1)
+      theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "update" && QUOTE & castlibList[r][3] & QUOTE && "2>&1", RETURN, 0, 1)
       if count(theresult) < 1 then
         theError = theresult[1]
@@ -2144 +2144 @@
     
     
-    theresult = mDoShellCmd(me, svnBinary && "status" && QUOTE & castlibList[r][3] & QUOTE, RETURN, 0, 1)
+    theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "status" && QUOTE & castlibList[r][3] & QUOTE, RETURN, 0, 1)
     
     cnt = count(theresult)
@@ -2171 +2171 @@
   mDisplayWaitStatusText me, "SVN commit for:" && pathStr
   
-  theresult = mDoShellCmd(me, svnBinary && "ci --message" && QUOTE & msg & QUOTE & pathStr, RETURN, 0, 1)
+  theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "ci --message" && QUOTE & msg & QUOTE & pathStr, RETURN, 0, 1)
   
   
@@ -2366 +2366 @@
   mDisplayWaitStatusText me, "SVN update for:" && workingFolder
   
-  theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolder & QUOTE, RETURN, 0, 1)
+  theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "update" && QUOTE & workingFolder & QUOTE, RETURN, 0, 1)
   
   if count(theresult) < 1 then
-    theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolder & QUOTE && "2>&1", RETURN, 0, 1)
+    theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "update" && QUOTE & workingFolder & QUOTE && "2>&1", RETURN, 0, 1)
     if count(theresult) < 1 then
       theError = theresult[1]
@@ -2389 +2389 @@
   ------- in order to implement #1 you can use a repeat loop just like the above repeat, which goes thorugh each castlib
   
-  theresult = mDoShellCmd(me, svnBinary && "status" && QUOTE & workingFolder & QUOTE, RETURN, 0, 1)
+  theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "status" && QUOTE & workingFolder & QUOTE, RETURN, 0, 1)
   
   cnt = count(theresult)
@@ -2413 +2413 @@
         
       "?": -- newly added file
-        mDoShellCmd(me, svnBinary && "add" && QUOTE & answ & QUOTE, RETURN, 0, 1)
+        mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "add" && QUOTE & answ & QUOTE, RETURN, 0, 1)
         
         put "Added file" && answ && "to the repository"
@@ -2429 +2429 @@
   mDisplayWaitStatusText me, "SVN commit of:" && workingFolder
   
-  theresult = mDoShellCmd(me, svnBinary && "ci --message" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE, RETURN, 0, 1)
+  theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "ci --message" && QUOTE & msg & QUOTE && QUOTE & workingFolder & QUOTE, RETURN, 0, 1)
   
   
@@ -2598 +2598 @@
   repeat with castlibPaths in castlibPathList
     
-    theresult = mDoShellCmd(me, svnBinary && "update" && "-r" && revisionNumber && QUOTE & castlibPaths[#newpathUnix] & QUOTE, RETURN, 0, 1)
+    theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "update" && "-r" && revisionNumber && QUOTE & castlibPaths[#newpathUnix] & QUOTE, RETURN, 0, 1)
     
     if count(theresult) < 1 then
@@ -2728 +2728 @@
   revisionNumber = getValidRevNumber(me, revisionNumber)
   
-  theresult = mDoShellCmd(me, svnBinary && "update" && "-r" && revisionNumber && QUOTE & workingFolderUnix & QUOTE, RETURN, 0, 1)
+  theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "update" && "-r" && revisionNumber && QUOTE & workingFolderUnix & QUOTE, RETURN, 0, 1)
   
   if count(theresult) > 0 then
@@ -3159 +3159 @@
   
   
-  theresult = mDoShellCmd(me, svnBinary && "update" & workingFolder, RETURN, 0, 1)
+  theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "update" & workingFolder, RETURN, 0, 1)
   
   
   if count(theresult) < 1 then
-    theresult = mDoShellCmd(me, svnBinary && "update" & workingFolder && "2>&1", RETURN, 0, 1)
+    theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "update" & workingFolder && "2>&1", RETURN, 0, 1)
     if count(theresult) < 1 then
       theError = theresult[1]
@@ -3202 +3202 @@
   
   
-  theresult = mDoShellCmd(me, svnBinary && "status" & workingFolder, RETURN, 0, 1)
+  theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "status" & workingFolder, RETURN, 0, 1)
   
   cnt = count(theresult)
@@ -3230 +3230 @@
         else
           
-          mDoShellCmd(me, svnBinary && "rm" && QUOTE & answ & QUOTE, RETURN, 0, 1)
+          mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "rm" && QUOTE & answ & QUOTE, RETURN, 0, 1)
           
           put "Deleted file" && answ && "in the repository"
@@ -3240 +3240 @@
         
       "?": -- newly added file
-        mDoShellCmd(me, svnBinary && "add" && QUOTE & answ & QUOTE, RETURN, 0, 1)
+        mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "add" && QUOTE & answ & QUOTE, RETURN, 0, 1)
         
         put "Added file" && answ && "to the repository"
@@ -3258 +3258 @@
   mDisplayWaitStatusText me, "SVN commit:" && workingFolder
   
-  theresult = mDoShellCmd(me, svnBinary && "ci --message" && QUOTE & msg & QUOTE & workingFolder, RETURN, 0, 1)
+  theresult = mDoShellCmd(me, QUOTE & svnBinary & QUOTE && "ci --message" && QUOTE & msg & QUOTE & workingFolder, RETURN, 0, 1)