diff --git a/CHANGELOG.md b/CHANGELOG.md index eb14f25..77ca1a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,7 @@ Releases: GitHub creates the tag and a release with the notes; the ISO itself (o **Features:** -* **ISO:** named after its release tag (`steamify-cachyos-2.9.3-2026.09.29-2230-x86_64.iso`; built by hand, the date), labelled after the Steamify version on it and the build time (`STEAMIFY_2_9_1_20260929_1432`, was CachyOS's `COS_`); CachyOS Hello installs it like CachyOS's own +* **ISO:** named after its release tag (`steamify-cachyos-2.9.3-2026.09.29-2030-x86_64.iso`; built by hand, without a tag: `local`), labelled after the Steamify version on it and the build time (`STEAMIFY_2_9_1_20260929_1432`, was CachyOS's `COS_`); CachyOS Hello installs it like CachyOS's own release (the ISO's own release, its tag without the v, is in `/etc/steammachine-iso-build` and the boot menu) * **Installer (CachyOS - Steamify Installer):** * A Steamify page after the packages page: which Steam Machine parts to set up (rows from diff --git a/archiso/profiledef.sh b/archiso/profiledef.sh index d4fb74f..5baa27c 100644 --- a/archiso/profiledef.sh +++ b/archiso/profiledef.sh @@ -2,20 +2,19 @@ # shellcheck disable=SC2034 iso_name="steamify-cachyos" -# The label follows the release name: the Steamify version on the ISO (steamify-prepare.sh put it there) -# plus the build date and time, e.g. STEAMIFY_2_9_1_20260929_1432 (ISO 9660: at most 32 characters, -# A-Z 0-9 _). STEAMIFY_BUILD_STAMP (YYYYMMDD_HHMM, UTC) from the release workflow, so both name the same -# moment; built by hand, the time now (UTC). +# The label follows the release tag, which GitHub names (iso-release.yml): the Steamify version on the ISO +# (steamify-prepare.sh put it there) plus the tag's date and time, e.g. STEAMIFY_2_9_3_20260929_2030 (ISO 9660: +# at most 32 characters, A-Z 0-9 _). STEAMIFY_BUILD_STAMP (YYYYMMDD_HHMM, UTC) comes from the tag; the build +# reads no clock of its own. Built by hand, without a tag: LOCAL. _steamify="$(sed -n 's/^VERSION=//p' "${BASH_SOURCE[0]%/*}/airootfs/usr/local/share/steamify/steamify.sh" 2>/dev/null | head -n 1)" -_stamp="${STEAMIFY_BUILD_STAMP:-$(date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d_%H%M)}" +_stamp="${STEAMIFY_BUILD_STAMP:-LOCAL}" iso_label="STEAMIFY_${_steamify:+${_steamify//./_}_}${_stamp}" iso_label="${iso_label:0:32}" iso_publisher="CachyOS " iso_application="Steamify CachyOS Live (based on CachyOS)" -# The file name (--x86_64.iso) follows the release tag without its v -# (STEAMIFY_ISO_VERSION from the release workflow: steamify-cachyos-2.9.3-dev.2026.09.29-2230-x86_64.iso); -# built by hand, the date. -iso_version="${STEAMIFY_ISO_VERSION:-$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)}" +# The file name (--x86_64.iso) is the release tag without its v (STEAMIFY_ISO_VERSION +# from the tag: steamify-cachyos-2.9.3-dev.2026.09.29-2030-x86_64.iso). Built by hand, without a tag: local. +iso_version="${STEAMIFY_ISO_VERSION:-local}" install_dir="arch" buildmodes=('iso') ## GRUB diff --git a/util-iso.sh b/util-iso.sh index 3b32b74..4f6792c 100755 --- a/util-iso.sh +++ b/util-iso.sh @@ -141,8 +141,9 @@ prepare_profile(){ info "Profile: [%s]" "${profile}" # The release tag without its v when the release workflow builds (STEAMIFY_ISO_VERSION): the boot menu - # and /etc/steammachine-iso-build name the same release as the file, label and tag. By hand: the date. - local _iso_version="${STEAMIFY_ISO_VERSION:-$(date +%y%m%d)}" + # and /etc/steammachine-iso-build name the same release as the file, label and tag (no clock of its own). + # By hand, without a tag: local. + local _iso_version="${STEAMIFY_ISO_VERSION:-local}" change_grub_version "${_iso_version}" # Fetch up-to-date version of CachyOS repo mirrorlist