Repository: hbase Updated Branches: refs/heads/branch-1 4bdfa342a -> ac6af9f43 refs/heads/branch-1.2 86da60d7f -> ee2eba1d6 refs/heads/branch-1.3 4fc36c6e4 -> 57c70a98f refs/heads/branch-1.4 1595ceef2 -> c8f4af0e8
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/ac6af9f4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ac6af9f4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ac6af9f4 Branch: refs/heads/branch-1 Commit: ac6af9f43ae9e4081de35995ce942a5a1e94f5f4 Parents: 4bdfa34 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:41:59 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/ac6af9f4/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 05d3354..cde3b30 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" @@ -61,11 +61,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}")"