From: aroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu, 15 Nov 2007 21:35:28 +0000 (+0000)
Subject:         Make run-safari actually work on Windows
X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=f8237a4bdde0ce17c01a379dccf778a89023e35f

    Make run-safari actually work on Windows

        * Scripts/run-safari: Fixed the order of arguments to cp, and added a
        chdir call.


git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27817 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d192dac..65202a8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-15  Adam Roben  <aroben@apple.com>
+
+        Make run-safari actually work on Windows
+
+        * Scripts/run-safari: Fixed the order of arguments to cp, and added a
+        chdir call.
+
 2007-11-14  Adam Roben  <aroben@apple.com>
 
         Updates to Safari launching now that 3.0.4 is released
diff --git a/WebKitTools/Scripts/run-safari b/WebKitTools/Scripts/run-safari
index 8a2021a..b044ddf 100755
--- a/WebKitTools/Scripts/run-safari
+++ b/WebKitTools/Scripts/run-safari
@@ -50,13 +50,14 @@ if (isOSX()) {
     $ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES";
     @args = @ARGV;
 } elsif (isCygwin()) {
-    my $result = system "cp", $productDir, "$FindBin::Bin/run-webkit-nightly.cmd";
+    my $script = "run-webkit-nightly.cmd";
+    my $result = system "cp", "$FindBin::Bin/$script", $productDir;
     die if $result;
 
-    chomp(my $path = `cygpath -w '$productDir/run-webkit-nightly.cmd'`);
+    chdir $productDir;
 
     $safariPath = "cmd";
-    @args = ("/c", "call $path");
+    @args = ("/c", "call $script");
 }
 exec $safariPath, @args or die;