From ba9ba380a674ee86ed5dde017d7470d2a10f2e4b Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 08 Jul 2013 13:08:10 +0000
Subject: [PATCH] [OPENDJ-1063] CR-1971 Fix "build.sh package-RPM" target which fails when the build path contains spaces
---
opends/src/build-tools/org/opends/build/tools/GenerateRpm.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java b/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java
index 80d84ac..c9af268 100644
--- a/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java
+++ b/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java
@@ -68,7 +68,7 @@
public void setTopDir(File topDir)
{
this.topDir = topDir;
- topDirAbsolutePath = topDir.getAbsolutePath();
+ topDirAbsolutePath = topDir.getAbsolutePath().replaceAll(" ", "\\\\ ");
}
/**
@@ -370,11 +370,11 @@
sb.append("# %build" + EOL);
sb.append(EOL);
sb.append("%install" + EOL);
- sb.append("mkdir -p $RPM_BUILD_ROOT%{_prefix}" + EOL);
- sb.append("cd $RPM_BUILD_ROOT%{_prefix}" + EOL);
+ sb.append("mkdir -p \"$RPM_BUILD_ROOT%{_prefix}\"" + EOL);
+ sb.append("cd \"$RPM_BUILD_ROOT%{_prefix}\"" + EOL);
for (final File f : listFiles)
{
- sb.append("cp -r " + f.getPath() + " ." + EOL);
+ sb.append("cp -r \"" + f.getPath() + "\" ." + EOL);
}
sb.append(EOL);
sb.append("# =========================" + EOL);
--
Gitblit v1.10.0