diff --git a/.github/workflows/build-canary-v3-cosmo-iso.yml b/.github/workflows/build-canary-v3-cosmo-iso.yml index 6bc05f8..d905b92 100644 --- a/.github/workflows/build-canary-v3-cosmo-iso.yml +++ b/.github/workflows/build-canary-v3-cosmo-iso.yml @@ -31,7 +31,7 @@ jobs: if_key_exists: replace - name: Set ISO Info - run: sed "s/#DISTNAME#/PikaOS-Canary-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh + run: sed "s/#DISTNAME#/PikaOS-Canary-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh - name: Get ISO Build Dependencies run: ./get_iso_build_dep.sh diff --git a/.github/workflows/build-canary-v3-iso.yml b/.github/workflows/build-canary-v3-iso.yml index b9ae31a..47e6d9e 100644 --- a/.github/workflows/build-canary-v3-iso.yml +++ b/.github/workflows/build-canary-v3-iso.yml @@ -31,7 +31,7 @@ jobs: if_key_exists: replace - name: Set ISO Info - run: sed "s/#DISTNAME#/PikaOS-Canary/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh + run: sed "s/#DISTNAME#/PikaOS-Canary/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh - name: Get ISO Build Dependencies run: ./get_iso_build_dep.sh diff --git a/.github/workflows/build-canary-v3-nvidia-iso.yml b/.github/workflows/build-canary-v3-nvidia-iso.yml index 9377c97..cba8cab 100644 --- a/.github/workflows/build-canary-v3-nvidia-iso.yml +++ b/.github/workflows/build-canary-v3-nvidia-iso.yml @@ -31,7 +31,7 @@ jobs: if_key_exists: replace - name: Set ISO Info - run: sed "s/#DISTNAME#/PikaOS-Canary-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh + run: sed "s/#DISTNAME#/PikaOS-Canary-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/true/g" -i ./info.sh - name: Get ISO Build Dependencies run: ./get_iso_build_dep.sh diff --git a/.github/workflows/build-nest-v3-cosmo-iso.yml b/.github/workflows/build-nest-v3-cosmo-iso.yml index 9bc02b4..c5effb7 100644 --- a/.github/workflows/build-nest-v3-cosmo-iso.yml +++ b/.github/workflows/build-nest-v3-cosmo-iso.yml @@ -31,7 +31,7 @@ jobs: if_key_exists: replace - name: Set ISO Info - run: sed "s/#DISTNAME#/PikaOS-Nest-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh + run: sed "s/#DISTNAME#/PikaOS-Nest-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh - name: Get ISO Build Dependencies run: ./get_iso_build_dep.sh diff --git a/.github/workflows/build-nest-v3-iso.yml b/.github/workflows/build-nest-v3-iso.yml index 60960bd..dda0f76 100644 --- a/.github/workflows/build-nest-v3-iso.yml +++ b/.github/workflows/build-nest-v3-iso.yml @@ -31,7 +31,7 @@ jobs: if_key_exists: replace - name: Set ISO Info - run: sed "s/#DISTNAME#/PikaOS-Nest/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh + run: sed "s/#DISTNAME#/PikaOS-Nest/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh - name: Get ISO Build Dependencies run: ./get_iso_build_dep.sh diff --git a/.github/workflows/build-nest-v3-nvidia-iso.yml b/.github/workflows/build-nest-v3-nvidia-iso.yml index 7c0a1cf..ecc6713 100644 --- a/.github/workflows/build-nest-v3-nvidia-iso.yml +++ b/.github/workflows/build-nest-v3-nvidia-iso.yml @@ -31,7 +31,7 @@ jobs: if_key_exists: replace - name: Set ISO Info - run: sed "s/#DISTNAME#/PikaOS-Nest-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh + run: sed "s/#DISTNAME#/PikaOS-Nest-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/true/g" -i ./info.sh - name: Get ISO Build Dependencies run: ./get_iso_build_dep.sh diff --git a/.github/workflows/release-canary-v3-cosmo-iso.yml b/.github/workflows/release-canary-v3-cosmo-iso.yml index 28dd23d..2700e14 100644 --- a/.github/workflows/release-canary-v3-cosmo-iso.yml +++ b/.github/workflows/release-canary-v3-cosmo-iso.yml @@ -31,7 +31,7 @@ jobs: if_key_exists: replace - name: Set ISO Info - run: sed "s/#DISTNAME#/PikaOS-Canary-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh + run: sed "s/#DISTNAME#/PikaOS-Canary-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh - name: Get ISO Build Dependencies run: ./get_iso_build_dep.sh diff --git a/.github/workflows/release-canary-v3-iso.yml b/.github/workflows/release-canary-v3-iso.yml index fb5d359..380b2c7 100644 --- a/.github/workflows/release-canary-v3-iso.yml +++ b/.github/workflows/release-canary-v3-iso.yml @@ -31,7 +31,7 @@ jobs: if_key_exists: replace - name: Set ISO Info - run: sed "s/#DISTNAME#/PikaOS-Canary/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh + run: sed "s/#DISTNAME#/PikaOS-Canary/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh - name: Get ISO Build Dependencies run: ./get_iso_build_dep.sh diff --git a/.github/workflows/release-canary-v3-nvidia-iso.yml b/.github/workflows/release-canary-v3-nvidia-iso.yml index a1dcfd3..6bb7fd8 100644 --- a/.github/workflows/release-canary-v3-nvidia-iso.yml +++ b/.github/workflows/release-canary-v3-nvidia-iso.yml @@ -31,7 +31,7 @@ jobs: if_key_exists: replace - name: Set ISO Info - run: sed "s/#DISTNAME#/PikaOS-Canary-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh + run: sed "s/#DISTNAME#/PikaOS-Canary-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/true/g" -i ./info.sh - name: Get ISO Build Dependencies run: ./get_iso_build_dep.sh diff --git a/.github/workflows/release-nest-v3-cosmo-iso.yml b/.github/workflows/release-nest-v3-cosmo-iso.yml index 53d3516..a765fa7 100644 --- a/.github/workflows/release-nest-v3-cosmo-iso.yml +++ b/.github/workflows/release-nest-v3-cosmo-iso.yml @@ -31,7 +31,7 @@ jobs: if_key_exists: replace - name: Set ISO Info - run: sed "s/#DISTNAME#/PikaOS-Nest-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh + run: sed "s/#DISTNAME#/PikaOS-Nest-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh - name: Get ISO Build Dependencies run: ./get_iso_build_dep.sh diff --git a/.github/workflows/release-nest-v3-iso.yml b/.github/workflows/release-nest-v3-iso.yml index 76abaeb..367e837 100644 --- a/.github/workflows/release-nest-v3-iso.yml +++ b/.github/workflows/release-nest-v3-iso.yml @@ -31,7 +31,7 @@ jobs: if_key_exists: replace - name: Set ISO Info - run: sed "s/#DISTNAME#/PikaOS-Nest/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh + run: sed "s/#DISTNAME#/PikaOS-Nest/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh - name: Get ISO Build Dependencies run: ./get_iso_build_dep.sh diff --git a/.github/workflows/release-nest-v3-nvidia-iso.yml b/.github/workflows/release-nest-v3-nvidia-iso.yml index d45f694..191f4ab 100644 --- a/.github/workflows/release-nest-v3-nvidia-iso.yml +++ b/.github/workflows/release-nest-v3-nvidia-iso.yml @@ -31,7 +31,7 @@ jobs: if_key_exists: replace - name: Set ISO Info - run: sed "s/#DISTNAME#/PikaOS-Nest-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh + run: sed "s/#DISTNAME#/PikaOS-Nest-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/true/g" -i ./info.sh - name: Get ISO Build Dependencies run: ./get_iso_build_dep.sh diff --git a/info.sh b/info.sh index d381518..aa4dc2b 100755 --- a/info.sh +++ b/info.sh @@ -6,11 +6,18 @@ export LIVE_BOOT_LIVE_PATH="$LIVE_BOOT_DATA_PATH/live" export ROOTFS_PATH="$LIVE_BOOT_PATH/rootfs" export LIVE_HOSTNAME="pikaos" export ISO_DISTNAME="#DISTNAME#" +export ISO_NVIDIA=#IS_ISO_NVIDIA# export ISO_KERNEL="6.12.5-pikaos" export ISO_ARCH="#ARCH#" export ISO_RELEASE="4.0" export ISO_DESKTOP="Hyprland" -export ISO_PATCH="2" -export ISO_LABEL="Pika HL $(date '+%y.%m.%d') $ISO_PATCH" +export ISO_DESKTOP_ID="HL" +export ISO_PATCH="1" +if [ "ISO_NVIDIA" = true ] +then + export ISO_LABEL="P"$ISO_DESKTOP_ID"N $(date '+%y.%m.%d') $ISO_PATCH" +else + export ISO_LABEL="P"$ISO_DESKTOP_ID" $(date '+%y.%m.%d') $ISO_PATCH" +fi export ISO_IMAGE="$ISO_DISTNAME-$ISO_DESKTOP-$ISO_RELEASE-$ISO_ARCH-$(date '+%y.%m.%d')-$ISO_PATCH" export LIVE_BOOT_VOLUME_NAME="$ISO_DISTNAME-$ISO_DESKTOP-$ISO_RELEASE-$ISO_ARCH-$ISO_PATCH"