aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Monteith <stuart.monteith@linaro.org>2017-01-09 16:59:08 +0000
committerStuart Monteith <stuart.monteith@linaro.org>2017-01-09 16:59:08 +0000
commitaad8b8472aa0386589938a5fc84177546fcbd8cf (patch)
treecf2498c455598f3dece0208a31d8b1d0dca18a1f
parenta7236eaa40354e4884e2898afadd829e22c1b13b (diff)
Fix location for tar image
The archive-image script was failing to put the builds into the correct location. I was reusing a variable, instead of using another one for the jdk location. Incidently, during publishing, this code should be replaced to publish to snapshots.linaro.org.
-rwxr-xr-xarchive-image6
1 files changed, 3 insertions, 3 deletions
diff --git a/archive-image b/archive-image
index 03c730a..23f796a 100755
--- a/archive-image
+++ b/archive-image
@@ -40,14 +40,14 @@ build_label=$4
image_dir=$BUILD_DIR/${build_config}-${build_type},label=${build_lable}/$YEAR/$DAY_OF_YEAR
if [ $(echo ${build_version} | tr -d u) -lt 9 ]; then
- image_dir=$image_dir/images/j2sdk-image
+ jdk_image_dir=$image_dir/images/j2sdk-image
else
- image_dir=$image_dir/images/jdk
+ jdk_image_dir=$image_dir/images/jdk
fi
if [ -d $image_dir ]; then
human_date=$(doy2date $YEAR $DAY_OF_YEAR "%Y-%m-%d")
tar -acf $image_dir/jdk${build_version}-${build_config}-${build_type}-${human_date}.tar.gz \
--exclude=demo --exclude=sample --exclude=man \
- --transform="s/./jdk${build_version}-${build_config}-${build_type}-${human_date}/" -C $image_dir .
+ --transform="s/./jdk${build_version}-${build_config}-${build_type}-${human_date}/" -C $jdk_image_dir .
fi