? windows.patch
Index: drush_make.download.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush_make/Attic/drush_make.download.inc,v
retrieving revision 1.1.2.31
diff -u -p -r1.1.2.31 drush_make.download.inc
--- drush_make.download.inc	22 Apr 2010 23:30:14 -0000	1.1.2.31
+++ drush_make.download.inc	20 May 2010 23:26:39 -0000
@@ -110,7 +110,7 @@ class DrushMakeDownload_Get extends Drus
 
   protected function unpack_gz($filename) {
     // Find out where contents will end up. Retrieve last column of output using awk.
-    drush_shell_exec("gzip --list %s | awk '{print $4;}'", $filename);
+    drush_shell_exec("gzip --list %s | awk \"{print $4;}\"", $filename);
     $info = drush_shell_exec_output();
     if ($info) {
       $info = array_pop($info);
@@ -195,10 +195,10 @@ class DrushMakeDownload_Git extends Drus
       $alt_url = strpos($download['url'], 'git://') !== FALSE ? "git@{$alt_url[0]}:{$alt_url[1]}" : "git://{$alt_url[0]}/{$alt_url[1]}";
 
       $this->project->download['branch'] = $download['branch'] = isset($download['branch']) ? $download['branch'] : 'master';
-      if (drush_shell_exec("git clone %s %s/%s", $download['url'], $tmp_path, $name)) {
+      if (drush_shell_exec("git clone %s %s", $download['url'], $tmp_path . "/" . $name)) {
         drush_log(dt('%project cloned from %url.', array('%project' => $name, '%url' => $download['url'])), 'ok');
       }
-      else if (drush_shell_exec("git clone %s %s/%s", $alt_url, $tmp_path, $name)) {
+      else if (drush_shell_exec("git clone %s %s", $alt_url, $tmp_path . "/" . $name)) {
         drush_log(dt("%project url %orig_url failed, using alternative url %alt_url.", array('%project' => $name, '%orig_url' => $download['url'], '%alt_url' => $alt_url)), 'ok');
         drush_log(dt('%project cloned from %url.', array('%project' => $name, '%url' => $alt_url)), 'ok');
       }
@@ -209,7 +209,7 @@ class DrushMakeDownload_Git extends Drus
       if ($download['branch'] !== 'master') {
         $cwd = getcwd();
         chdir($tmp_path . '/' . $name);
-        if (drush_shell_exec("git checkout -b %s origin/%s", $download['branch'], $download['branch'])) {
+        if (drush_shell_exec("git checkout -b %s %s", $download['branch'], "origin/" . $download['branch'])) {
           drush_log(dt("Checked out branch %branch.", array('%branch' => $download['branch'])), 'ok');
         }
         else {
@@ -230,7 +230,7 @@ class DrushMakeDownload_Git extends Drus
       }
       // Remove .git/ directory if working-copy flag was not specified.
       if (!drush_get_option('working-copy') && file_exists($tmp_path . '/' . $name . '/.git')) {
-        drush_shell_exec("rm -rf %s/%s/.git", $tmp_path, $name);
+        drush_shell_exec("rm -rf %s", $tmp_path . "/" . $name . "/.git");
       }
       return $name;
     }
Index: drush_make.drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush_make/Attic/drush_make.drush.inc,v
retrieving revision 1.11.2.40
diff -u -p -r1.11.2.40 drush_make.drush.inc
--- drush_make.drush.inc	25 Feb 2010 05:38:00 -0000	1.11.2.40
+++ drush_make.drush.inc	20 May 2010 23:26:39 -0000
@@ -325,15 +325,15 @@ function drush_make_base_path($base_path
 
 function drush_make_move_build($tmp_path, $base_path) {
   if ($base_path == '.') {
-    drush_shell_exec('ls -A %s/__build__', $tmp_path);
+    drush_shell_exec('ls -A %s', $tmp_path . "/__build__");
     $info = drush_shell_exec_output();
     foreach ($info as $file) {
-      drush_shell_exec("mv %s/__build__/%s %s/%s", $tmp_path, $file, $base_path, $file);
+      drush_shell_exec("mv -f %s %s", $tmp_path . "/__build__/" . $file, $base_path . "/" . $file);
     }
   }
   else {
     drush_make_fill_path(dirname($base_path));
-    drush_shell_exec("mv %s/__build__ %s", $tmp_path, $base_path);
+    drush_shell_exec("mv -f %s %s", $tmp_path . "/__build__", $base_path);
   }
   return TRUE;
 }
Index: drush_make.project.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush_make/Attic/drush_make.project.inc,v
retrieving revision 1.1.2.22
diff -u -p -r1.1.2.22 drush_make.project.inc
--- drush_make.project.inc	22 Apr 2010 23:30:14 -0000	1.1.2.22
+++ drush_make.project.inc	20 May 2010 23:26:39 -0000
@@ -58,8 +58,8 @@ class DrushMakeProject {
         }
         if (file_exists($filename)) {
           $patches_txt .= '- ' . $url . "\n";
-          drush_shell_exec("mv %s %s", $filename, $project_directory);
-          $patched = drush_shell_exec("patch -p0 -d %s < %s/%s", $project_directory, $project_directory, $filename);
+          drush_shell_exec("mv -f %s %s", $filename, $project_directory);
+          $patched = drush_shell_exec("patch -p0 -d %s < %s", $project_directory, $project_directory . "/" . $filename);
           drush_log($this->name . ' patched with ' . $filename . '.', $patched ? 'ok' : 'error');
           drush_op('unlink', $project_directory . '/' . $filename);
         }
@@ -82,11 +82,11 @@ class DrushMakeProject {
    */
   function move($project_directory) {
     if (empty($this->directory_name)) {
-      drush_shell_exec("mv %s/%s %s", $this->tmp_path, $project_directory, $this->path);
+      drush_shell_exec("mv -f %s %s", $this->tmp_path . "/" . $project_directory, $this->path);
     }
     else {
       list($project_directory) = array_reverse(explode('/', trim($project_directory, '/')));
-      drush_shell_exec("mv %s/%s %s/%s", $this->tmp_path, $project_directory, $this->path, $this->directory_name);
+      drush_shell_exec("mv -f %s %s", $this->tmp_path . "/" . $project_directory, $this->path . "/" . $this->directory_name);
       $project_directory = $this->directory_name;
     }
     return $this->path . '/' . $project_directory;
@@ -165,7 +165,7 @@ class DrushMakeProject_Core extends Drus
    * @TODO ensure that the core project is always created first.
    */
   function move($project_directory) {
-    drush_shell_exec("mv %s/%s %s/__build__", $this->tmp_path, $project_directory, $this->tmp_path);
+    drush_shell_exec("mv -f %s %s", $this->tmp_path . "/" . $project_directory, $this->tmp_path . "/__build__");
     return $this->tmp_path . '/__build__';
   }
 }
Index: drush_make.utilities.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush_make/Attic/drush_make.utilities.inc,v
retrieving revision 1.1.2.28
diff -u -p -r1.1.2.28 drush_make.utilities.inc
--- drush_make.utilities.inc	22 Apr 2010 23:30:14 -0000	1.1.2.28
+++ drush_make.utilities.inc	20 May 2010 23:26:39 -0000
@@ -230,7 +230,7 @@ function drush_make_valid_url($url, $abs
 
 
 function drush_make_create_tmp() {
-  $tmp = sys_get_temp_dir();
+  $tmp = preg_replace('/\/$/','', str_replace('\\','/', sys_get_temp_dir()));
   $tmp .= '/drush_make_tmp_' . time();
   drush_op('mkdir', $tmp);
   drush_log(dt('Created directory temporary directory %tmp', array('%tmp' => $tmp)), 'notice');
@@ -259,14 +259,14 @@ function drush_make_tar($tmp_path, $base
   $dirname = basename($base_path, '.tar.gz');
   // Move the build directory to a more human-friendly name, so that tar will
   // use it instead.
-  drush_shell_exec("mv %s/__build__ %s/%s", $tmp_path, $tmp_path, $dirname);
+  drush_shell_exec("mv -f %s %s", $tmp_path . "/__build__", $tmp_path . "/" . $dirname);
   // Only move the tar file to it's final location if it's been built
   // successfully.
-  if (drush_shell_exec("tar -C %s -Pczf %s/%s %s", $tmp_path, $tmp_path, $filename, $dirname)) {
-    drush_shell_exec("mv %s/%s %s", $tmp_path, $filename, $base_path);
+  if (drush_shell_exec("tar -C %s -Pczf %s %s", $tmp_path, $tmp_path . "/" . $filename, $dirname)) {
+    drush_shell_exec("mv -f %s %s", $tmp_path . "/" . $filename, $base_path);
   };
   // Move the build directory back to it's original location for consistency.
-  drush_shell_exec("mv %s/%s %s/__build__", $tmp_path, $dirname, $tmp_path);
+  drush_shell_exec("mv -f %s %s", $tmp_path . "/" . $dirname, $tmp_path . "/__build__");
 }
 
 /**
