HBASE-20134 dev-support scripts should use mktemp instead of hard-coding /tmp.
Signed-off-by: Mike Drob <md...@apache.org>
Conflicts:
dev-support/jenkins-scripts/generate-hbase-website.sh
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ee2eba1d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ee2eba1d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ee2eba1d
Branch: refs/heads/branch-1.2
Commit: ee2eba1d670e86d4e6fe8fb8e68268b2b05f73c4
Parents: 86da60d
Author: Sean Busbey <bus...@apache.org>
Authored: Mon Mar 5 23:40:25 2018 -0600
Committer: Sean Busbey <bus...@apache.org>
Committed: Tue Mar 6 12:44:18 2018 -0600
----------------------------------------------------------------------
dev-support/hbase_nightly_source-artifact.sh | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ee2eba1d/dev-support/hbase_nightly_source-artifact.sh
----------------------------------------------------------------------
diff --git a/dev-support/hbase_nightly_source-artifact.sh
b/dev-support/hbase_nightly_source-artifact.sh
index b334fa5..9458324 100755
--- a/dev-support/hbase_nightly_source-artifact.sh
+++ b/dev-support/hbase_nightly_source-artifact.sh
@@ -21,7 +21,7 @@ function usage {
echo "Usage: ${0} [options] /path/to/component/checkout"
echo ""
echo " --intermediate-file-dir /path/to/use Path for writing listings
and diffs. must exist."
- echo " defaults to making a
directory in /tmp."
+ echo " defaults to making a
directory via mktemp."
echo " --unpack-temp-dir /path/to/use Path for unpacking tarball.
default to"
echo " 'unpacked_src_tarball' in
intermediate directory."
echo " --maven-m2-initial /path/to/use Path for maven artifacts
while building in"
@@ -67,11 +67,10 @@ fi
component_dir="$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"
if [ -z "${working_dir}" ]; then
- working_dir=/tmp
- while [[ -e ${working_dir} ]]; do
- working_dir=/tmp/hbase-srctarball-test-${RANDOM}.${RANDOM}
- done
- mkdir "${working_dir}"
+ if ! working_dir="$(mktemp -d -t hbase-srctarball-test)" ; then
+ echo "Failed to create temporary working directory. Please specify via
--unpack-temp-dir"
+ exit 1
+ fi
else
# absolutes please
working_dir="$(cd "$(dirname "${working_dir}")"; pwd)/$(basename
"${working_dir}")"
