diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-30 11:25:31 +0000 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-30 11:25:31 +0000 |
| commit | 7f304958933fadaa9d0ff51a55d0c009d0bf342c (patch) | |
| tree | 203b427f203a2a4e3983a12aebfba39d00a8ff79 | |
| parent | 539be947c8fcaa308b8eaca6c393e8f908eb3e89 (diff) | |
archive-image expected too many parameters
This was failing as build variant no longer passed.
| -rwxr-xr-x | archive-image | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/archive-image b/archive-image index 178247a..a8b6e70 100755 --- a/archive-image +++ b/archive-image @@ -28,15 +28,14 @@ source ${SCRIPTPATH}/date-vars.sh : ${BUILD_DIR:=${TOP_DIR}/builds} -if [ $# -lt 3 ]; then - echo "usage: $progname: <build-config> <build-type> <build-label>" +if [ $# -lt 2 ]; then + echo "usage: $progname: <build-config> <build-label>" exit 1 fi build_version=$JDK_VERSION -build_type=$2 -build_label=$3 -image_dir=$BUILD_DIR/${build_config}-${build_type},label=${build_label}/$YEAR/$DAY_OF_YEAR +build_label=$2 +image_dir=$BUILD_DIR/${build_config},label=${build_label}/$YEAR/$DAY_OF_YEAR if [ $(echo ${build_version} | tr -d u) -lt 9 ]; then jdk_image_dir=$image_dir/images/j2sdk-image @@ -46,7 +45,7 @@ fi if [ -d $image_dir ]; then human_date=$(doy2date $YEAR $DAY_OF_YEAR "%Y-%m-%d") - tar -acf $image_dir/jdk${build_version}-${build_type}-${human_date}.tar.gz \ + tar -acf $image_dir/jdk${build_version}-${human_date}.tar.gz \ --exclude=demo --exclude=sample --exclude=man \ - --transform="s/./jdk${build_version}-${build_type}-${human_date}/" -C $jdk_image_dir . + --transform="s/./jdk${build_version}-${human_date}/" -C $jdk_image_dir . fi |