From 82839ea38bea1ab1e00bf8a6353f45336d4cc14f Mon Sep 17 00:00:00 2001
From: Wilson Liu <wliu5@unimelb.edu.au>
Date: Mon, 3 Dec 2018 22:57:59 +1100
Subject: [PATCH] Fixed issue when path contains spaces on windows;
---
pom.xml | 18 +++++++++---------
src/main/scripts/windows/mexplorer.cmd | 2 +-
src/main/scripts/windows/scp-get.cmd | 2 +-
src/main/scripts/windows/scp-put.cmd | 2 +-
src/main/scripts/windows/sftp-get.cmd | 2 +-
src/main/scripts/windows/sftp-put.cmd | 2 +-
.../scripts/windows/unimelb-mf-archive.cmd | 2 +-
src/main/scripts/windows/unimelb-mf-check.cmd | 2 +-
.../scripts/windows/unimelb-mf-download.cmd | 2 +-
src/main/scripts/windows/unimelb-mf-perf.cmd | 2 +-
src/main/scripts/windows/unimelb-mf-sync.cmd | 2 +-
src/main/scripts/windows/unimelb-mf-upload.cmd | 2 +-
12 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index bb251ff..d4c4a80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,15 +164,15 @@
dest="${dist}/mac/temp/unimelb-mf-clients-${project.version}" />
<dirset
dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}"
- id="jreDirId">
+ id="macJreDirId">
<include name="jre*" />
</dirset>
- <property name="jreDir" refid="jreDirId" />
- <property name="javaHome"
- value="${jreDir}/Contents/Home" />
+ <property name="macJreDir" refid="macJreDirId" />
+ <property name="macJavaHome"
+ value="${macJreDir}/Contents/Home" />
<replace
dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix"
- token="@JAVA_HOME@" value="${javaHome}" />
+ token="@JAVA_HOME@" value="${macJavaHome}" />
<replace
dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix"
token="#export JAVA_HOME=" value="export JAVA_HOME=" />
@@ -225,14 +225,14 @@
dest="${dist}/windows/temp/unimelb-mf-clients-${project.version}" />
<dirset
dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}"
- id="jreDirId">
+ id="winJreDirId">
<include name="jre*" />
</dirset>
- <property name="jreDir" refid="jreDirId" />
- <property name="javaHome" value="${jreDir}" />
+ <property name="winJreDir" refid="winJreDirId" />
+ <property name="winJavaHome" value="${winJreDir}" />
<replace
dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows"
- token="@JAVA_HOME@" value="${javaHome}" />
+ token="@JAVA_HOME@" value="${winJavaHome}" />
<replace
dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows"
token="@REM set JAVA_HOME=" value="set JAVA_HOME=" />
diff --git a/src/main/scripts/windows/mexplorer.cmd b/src/main/scripts/windows/mexplorer.cmd
index 7cd5bca..d47d16e 100644
--- a/src/main/scripts/windows/mexplorer.cmd
+++ b/src/main/scripts/windows/mexplorer.cmd
@@ -9,4 +9,4 @@ popd
set JAR=%ROOT%\lib\mexplorer.jar
-java -Xmx1024m -jar %JAR% %*
+java -Xmx1024m -jar "%JAR%" %*
diff --git a/src/main/scripts/windows/scp-get.cmd b/src/main/scripts/windows/scp-get.cmd
index f7ea228..3a089cf 100644
--- a/src/main/scripts/windows/scp-get.cmd
+++ b/src/main/scripts/windows/scp-get.cmd
@@ -9,6 +9,6 @@ popd
set JAR=%ROOT%\lib\unimelb-mf-clients.jar
-java -Xmx200m -cp %JAR% unimelb.mf.client.ssh.cli.SCPGetCLI %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.ssh.cli.SCPGetCLI %*
diff --git a/src/main/scripts/windows/scp-put.cmd b/src/main/scripts/windows/scp-put.cmd
index 123edff..1e32ea6 100644
--- a/src/main/scripts/windows/scp-put.cmd
+++ b/src/main/scripts/windows/scp-put.cmd
@@ -9,4 +9,4 @@ popd
set JAR=%ROOT%\lib\unimelb-mf-clients.jar
-java -Xmx200m -cp %JAR% unimelb.mf.client.ssh.cli.SCPPutCLI %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.ssh.cli.SCPPutCLI %*
diff --git a/src/main/scripts/windows/sftp-get.cmd b/src/main/scripts/windows/sftp-get.cmd
index fd9b3aa..bd4c06f 100644
--- a/src/main/scripts/windows/sftp-get.cmd
+++ b/src/main/scripts/windows/sftp-get.cmd
@@ -9,4 +9,4 @@ popd
set JAR=%ROOT%\lib\unimelb-mf-clients.jar
-java -Xmx200m -cp %JAR% unimelb.mf.client.ssh.cli.SFTPGetCLI %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.ssh.cli.SFTPGetCLI %*
diff --git a/src/main/scripts/windows/sftp-put.cmd b/src/main/scripts/windows/sftp-put.cmd
index 614aabe..78b2bf1 100644
--- a/src/main/scripts/windows/sftp-put.cmd
+++ b/src/main/scripts/windows/sftp-put.cmd
@@ -9,4 +9,4 @@ popd
set JAR=%ROOT%\lib\unimelb-mf-clients.jar
-java -Xmx200m -cp %JAR% unimelb.mf.client.ssh.cli.SFTPPutCLI %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.ssh.cli.SFTPPutCLI %*
diff --git a/src/main/scripts/windows/unimelb-mf-archive.cmd b/src/main/scripts/windows/unimelb-mf-archive.cmd
index e898767..b724ccd 100644
--- a/src/main/scripts/windows/unimelb-mf-archive.cmd
+++ b/src/main/scripts/windows/unimelb-mf-archive.cmd
@@ -9,4 +9,4 @@ popd
set JAR=%ROOT%\lib\unimelb-mf-clients.jar
-java -Xmx200m -cp %JAR% unimelb.mf.client.archive.cli.MFArchiveCLI %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.archive.cli.MFArchiveCLI %*
diff --git a/src/main/scripts/windows/unimelb-mf-check.cmd b/src/main/scripts/windows/unimelb-mf-check.cmd
index 7956a1d..8826433 100644
--- a/src/main/scripts/windows/unimelb-mf-check.cmd
+++ b/src/main/scripts/windows/unimelb-mf-check.cmd
@@ -9,4 +9,4 @@ popd
set JAR=%ROOT%\lib\unimelb-mf-clients.jar
-java -Xmx200m -cp %JAR% unimelb.mf.client.sync.cli.MFCheck %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.sync.cli.MFCheck %*
diff --git a/src/main/scripts/windows/unimelb-mf-download.cmd b/src/main/scripts/windows/unimelb-mf-download.cmd
index bce97c2..7b44c5b 100644
--- a/src/main/scripts/windows/unimelb-mf-download.cmd
+++ b/src/main/scripts/windows/unimelb-mf-download.cmd
@@ -8,4 +8,4 @@ popd
@REM set PATH=%JAVA_HOME%\bin;%PATH%
set JAR=%ROOT%\lib\unimelb-mf-clients.jar
-java -Xmx200m -cp %JAR% unimelb.mf.client.sync.cli.MFDownload %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.sync.cli.MFDownload %*
diff --git a/src/main/scripts/windows/unimelb-mf-perf.cmd b/src/main/scripts/windows/unimelb-mf-perf.cmd
index db817c8..4ee81fd 100644
--- a/src/main/scripts/windows/unimelb-mf-perf.cmd
+++ b/src/main/scripts/windows/unimelb-mf-perf.cmd
@@ -8,4 +8,4 @@ popd
@REM set PATH=%JAVA_HOME%\bin;%PATH%
set JAR=%ROOT%\lib\unimelb-mf-clients.jar
-java -Xmx200m -cp %JAR% unimelb.mf.client.perf.cli.MFPerfCLI %*
\ No newline at end of file
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.perf.cli.MFPerfCLI %*
\ No newline at end of file
diff --git a/src/main/scripts/windows/unimelb-mf-sync.cmd b/src/main/scripts/windows/unimelb-mf-sync.cmd
index fee85fc..f565305 100644
--- a/src/main/scripts/windows/unimelb-mf-sync.cmd
+++ b/src/main/scripts/windows/unimelb-mf-sync.cmd
@@ -9,4 +9,4 @@ popd
set JAR=%ROOT%\lib\unimelb-mf-clients.jar
-java -Xmx200m -cp %JAR% unimelb.mf.client.sync.cli.MFSync %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.sync.cli.MFSync %*
diff --git a/src/main/scripts/windows/unimelb-mf-upload.cmd b/src/main/scripts/windows/unimelb-mf-upload.cmd
index 6271708..8412c85 100644
--- a/src/main/scripts/windows/unimelb-mf-upload.cmd
+++ b/src/main/scripts/windows/unimelb-mf-upload.cmd
@@ -9,4 +9,4 @@ popd
set JAR=%ROOT%\lib\unimelb-mf-clients.jar
-java -Xmx200m -cp %JAR% unimelb.mf.client.sync.cli.MFUpload %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.sync.cli.MFUpload %*
--
GitLab