From 3ee566ccb8f34a054751b9dca6a7129928177015 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Wed, 21 Mar 2018 14:27:36 +0200
Subject: [PATCH] Adjust unpack directory for Solr installation. (#1152)
- Use builddir instead of bare /tmp to make sure it's a directory and not a symlink that phing would choke on.
---
build.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 622966cb00f..bf08ab70386 100644
--- a/build.xml
+++ b/build.xml
@@ -180,9 +180,10 @@
</then>
</if>
<!-- unpack the archive into solr/vendor -->
- <untar file="${srcdir}/downloads/solr-${solr_version}.tgz" todir="${tmp}" />
+ <mkdir dir="${builddir}/solr" />
+ <untar file="${srcdir}/downloads/solr-${solr_version}.tgz" todir="${builddir}/solr" />
<delete dir="${srcdir}/solr/vendor" includeemptydirs="true" failonerror="false" />
- <move file="${tmp}/solr-${solr_version}" tofile="${srcdir}/solr/vendor" />
+ <move file="${builddir}/solr/solr-${solr_version}" tofile="${srcdir}/solr/vendor" />
<!-- make scripts executable -->
<chmod mode="0755">
<fileset dir="${srcdir}/solr/vendor/bin">
--
GitLab