From b8ee9da1e87eaff5905323b04b71a4547845b5f5 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Fri, 27 Jun 2014 11:07:47 -0500
Subject: [PATCH] (Windows) handle spaces in path names patch by Josh McKenzie;
 reviewed by Jorge Bay for CASSANDRA-7451

---
 CHANGES.txt            | 1 +
 bin/cassandra.bat      | 2 +-
 bin/cassandra.ps1      | 2 +-
 conf/cassandra-env.ps1 | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 47a599225d..9a3ac17478 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.0
+ * (Windows) handle spaces in path names (CASSANDRA-7451)
 Merged from 2.0:
  * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
  * Support DISTINCT for static columns and fix behaviour when DISTINC is
diff --git a/bin/cassandra.bat b/bin/cassandra.bat
index e4e07aa5c3..8f645f269e 100644
--- a/bin/cassandra.bat
+++ b/bin/cassandra.bat
@@ -35,7 +35,7 @@ goto runLegacy
 REM -----------------------------------------------------------------------------
 :runPowerShell
 echo Detected powershell execution permissions.  Running with enhanced startup scripts.
-powershell /file %CASSANDRA_HOME%\bin\cassandra.ps1 %*
+powershell /file "%CASSANDRA_HOME%\bin\cassandra.ps1" %*
 goto finally
 
 REM -----------------------------------------------------------------------------
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 98b5b2792b..5225e326d0 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -79,7 +79,7 @@ Function Main
 
     $logdir = "$env:CASSANDRA_HOME/logs"
     $storagedir = "$env:CASSANDRA_HOME/data"
-    $env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + " -Dcassandra.logdir=$logdir -Dcassandra.storagedir=$storagedir"
+    $env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + " -Dcassandra.logdir=""$logdir"" -Dcassandra.storagedir=""$storagedir"""
 
     # Other command line params
     if ($H)
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index efef415bdd..87a5cfecf9 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -39,7 +39,7 @@ Function SetCassandraMain()
 #-----------------------------------------------------------------------------
 Function BuildClassPath
 {
-    $cp = "$env:CASSANDRA_HOME\conf"
+    $cp = """$env:CASSANDRA_HOME\conf"""
     foreach ($file in Get-ChildItem "$env:CASSANDRA_HOME\lib\*.jar")
     {
         $file = $file -replace "\\", "/"
@@ -47,7 +47,7 @@ Function BuildClassPath
     }
 
     # Add build/classes/main so it works in development
-    $cp = $cp + ";" + "$env:CASSANDRA_HOME\build\classes\main;$env:CASSANDRA_HOME\build\classes\thrift"
+    $cp = $cp + ";" + """$env:CASSANDRA_HOME\build\classes\main"";""$env:CASSANDRA_HOME\build\classes\thrift"""
     $env:CLASSPATH=$cp
 }