diff --git a/bin/omarchy-iso-make b/bin/omarchy-iso-make index f079f12..404153f 100755 --- a/bin/omarchy-iso-make +++ b/bin/omarchy-iso-make @@ -36,7 +36,13 @@ docker run --rm \ # Make iso accessible to all sudo chmod 777 -R "$BUILD_RELEASE_PATH" -# Offer to boot the new build -echo +# Move as install ref latest_iso=$(\ls -t "$BUILD_RELEASE_PATH"/*.iso | head -n1) -gum confirm "Boot $latest_iso?" && omarchy-iso-boot "$latest_iso" +iso_ref="${latest_iso%.*}-$OMARCHY_INSTALLER_REF.iso" +mv "$latest_iso" "$iso_ref" + +# Offer to boot the new build +if [[ $1 != "--no-boot-offer" ]]; then + echo + gum confirm "Boot $iso_ref?" && omarchy-iso-boot "$iso_ref" +fi diff --git a/bin/omarchy-iso-release b/bin/omarchy-iso-release index a0b154c..67fc35c 100755 --- a/bin/omarchy-iso-release +++ b/bin/omarchy-iso-release @@ -2,10 +2,29 @@ BUILD_ROOT=$(realpath "${BASH_SOURCE[0]%/*}/..") BUILD_RELEASE_PATH="$BUILD_ROOT/release" -RELEASE_ISO="$BUILD_RELEASE_PATH/omarchy-online.iso" -# Sign and upload the latest ISO -latest_iso=$(\ls -t "$BUILD_RELEASE_PATH"/*x86_64.iso | head -n1) -cp "$latest_iso" "$RELEASE_ISO" -omarchy-iso-sign "$RELEASE_ISO" -omarchy-iso-upload "$RELEASE_ISO" +# Make ISOs +if [[ $1 != "--no-make" ]]; then + echo -e "\e[32mMaking master ISO\e[0m" + OMARCHY_INSTALLER_REF=master omarchy-iso-make --no-boot-offer + echo -e "\e[32m\nMaking dev ISO\e[0m" + OMARCHY_INSTALLER_REF=dev omarchy-iso-make --no-boot-offer +else + echo -e "\e[31mSkipping remaking ISOs\e[0m" +fi + +# Sign and upload master ISO +latest_master_iso=$(\ls -t "$BUILD_RELEASE_PATH"/*x86_64-master.iso | head -n1) +release_master_iso="$BUILD_RELEASE_PATH/omarchy-online.iso" +cp "$latest_master_iso" "$release_master_iso" +echo -e "\e[32mSigning master ISO\e[0m" +omarchy-iso-sign "$release_master_iso" +omarchy-iso-upload "$release_master_iso" + +# Sign and upload dev ISO +latest_dev_iso=$(\ls -t "$BUILD_RELEASE_PATH"/*x86_64-dev.iso | head -n1) +release_dev_iso="$BUILD_RELEASE_PATH/omarchy-online-dev.iso" +cp "$latest_dev_iso" "$release_dev_iso" +echo -e "\e[32mSigning dev ISO\e[0m" +omarchy-iso-sign "$release_dev_iso" +omarchy-iso-upload "$release_dev_iso"