mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Christophe Sovant
08.08.2013 ba9ba380a674ee86ed5dde017d7470d2a10f2e4b
[OPENDJ-1063] CR-1971 Fix "build.sh package-RPM" target which fails when the build path contains spaces
1 files modified
8 ■■■■ changed files
opends/src/build-tools/org/opends/build/tools/GenerateRpm.java 8 ●●●● patch | view | raw | blame | history
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);