Merge branch 'cassandra-2.1' into trunk

2014-10-02 14:25:19 -05:00 · 2014-10-02 14:25:19 -05:00 · 75c376db87
parent e68f52b8d1 c4c56fa665
commit 75c376db87
1 changed files with 5 additions and 1 deletions
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@ -243,7 +243,10 @@ $env:JAVA_BIN
        try
        {
            $uname = uname -o
-            $cygwin = $true
+            if ($uname.CompareTo("Cygwin") -eq 0)
+            {
+                $cygwin = $true
+            }
        }
        catch
        {
@ -257,6 +260,7 @@ $env:JAVA_BIN
            # stop-server usage
            if (!$p)
            {
+                echo "Detected cygwin runtime environment.  Adding -Dcassandra-pidfile=$pidfile to JVM params as control+c trapping on mintty is inconsistent"
                $arg2 = $arg2 + " -Dcassandra-pidfile=$pidfile"
            }
        }