From 11d1e10e3f35b0b2f8ee4fab58833af50d9bffef Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 19 Jan 2021 16:27:13 +0100 Subject: [PATCH] bootstrap_sdk: Put image, contents and digests paths into variables It makes it a bit easier to read and clearer what the script is doing without all that repetition. --- bootstrap_sdk | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/bootstrap_sdk b/bootstrap_sdk index 12c6014b7d..d7910631e3 100755 --- a/bootstrap_sdk +++ b/bootstrap_sdk @@ -89,20 +89,25 @@ if [[ "$STAGES" =~ stage4 ]]; then info "Build complete! Changing output name to something more sensible." build_name="stage4-${ARCH}-${FLAGS_version}.tar.bz2" release_name="${TYPE}-${ARCH}-${FLAGS_version}.tar.bz2" - ln -f "$BUILDS/${build_name}" "$BUILDS/${release_name}" - ln -f "$BUILDS/${build_name}.CONTENTS" "$BUILDS/${release_name}.CONTENTS" + build_image="${BUILDS}/${build_name}" + release_image="${BUILDS}/${release_name}" + build_contents="${build_image}.CONTENTS" + release_contents="${release_image}.CONTENTS" + build_digests="${build_image}.DIGESTS" + release_digests="${release_image}.DIGESTS" + ln -f "${build_image}" "${release_image}" + ln -f "${build_contents}" "${release_contents}" sed -e "s/${build_name}/${release_name}/" \ - "$BUILDS/${build_name}.DIGESTS" > "$BUILDS/${release_name}.DIGESTS" + "${build_digests}" > "${release_digests}" # Validate we didn't break the DIGESTS with sed - verify_digests "$BUILDS/${release_name}" "$BUILDS/${release_name}.CONTENTS" + verify_digests "${release_image}" "${release_contents}" - info "SDK ready: $BUILDS/${release_name}" + info "SDK ready: ${release_image}" def_upload_path="${UPLOAD_ROOT}/sdk/${ARCH}/${FLAGS_version}" sign_and_upload_files "tarball" "${def_upload_path}" "" \ - "$BUILDS/${release_name}" \ - "$BUILDS/${release_name}.CONTENTS" "$BUILDS/${release_name}.DIGESTS" + "${release_image}" "${release_contents}" "${release_digests}" sign_and_upload_files "packages" "${def_upload_path}" "pkgs/" \ "${BINPKGS}"/*