From f7856e709825fbdeebfee78546b6c4d75a0a26dd Mon Sep 17 00:00:00 2001 From: qoijjj <129108030+qoijjj@users.noreply.github.com> Date: Thu, 21 Mar 2024 14:12:24 -0700 Subject: [PATCH] Revert "feat: add image tag warning to advise users not to use specific tags" This reverts commit 3dc08c057c9458e023f5d60ab8bc7993314ad696. --- config/files/usr/libexec/deprecated-images.json | 3 --- config/files/usr/libexec/ublue-motd | 12 +----------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/config/files/usr/libexec/deprecated-images.json b/config/files/usr/libexec/deprecated-images.json index 5bb1a20..193a421 100644 --- a/config/files/usr/libexec/deprecated-images.json +++ b/config/files/usr/libexec/deprecated-images.json @@ -3,8 +3,5 @@ "framework", "main-laptop", "nvidia-laptop" - ], - "imageTags": [ - "39" ] } \ No newline at end of file diff --git a/config/files/usr/libexec/ublue-motd b/config/files/usr/libexec/ublue-motd index b9897f1..8633288 100755 --- a/config/files/usr/libexec/ublue-motd +++ b/config/files/usr/libexec/ublue-motd @@ -15,6 +15,7 @@ DIFFERENCE=$((CURRENT_SECONDS - IMAGE_DATE_SECONDS)) MONTH=$((7 * 24 * 60 * 60)) readarray -t imageTypes < <(jq -r '.imageTypes[]' /usr/libexec/deprecated-images.json) + isDeprecated=false for imageType in "${imageTypes[@]}"; do if [[ "$IMAGE_REF_NAME" == *"$imageType"* ]]; then @@ -23,19 +24,8 @@ for imageType in "${imageTypes[@]}"; do fi done -readarray -t imageTags < <(jq -r '.imageTags[]' /usr/libexec/deprecated-images.json) -isOnSpecificTag=false -for imageTag in "${imageTags[@]}"; do - if [[ "$IMAGE_TAG" == *"$imageTag"* ]]; then - isOnSpecificTag=true - break - fi -done - if $isDeprecated; then TIP='~~~ NOTICE: You are on a deprecated image, please rebase. ~~~\n~~~ For more information, visit https://github.com/secureblue/secureblue/blob/live/config/files/usr/libexec/deprecated-images.json.md ~~~' -elif $isOnSpecificTag; then - TIP='~~~ NOTICE: You are on a specific tag, which is unsupported by secureblue. Rebase to the `latest` tag to ensure you continue to receive updates. ~~~' elif [ "$DIFFERENCE" -ge "$MONTH" ]; then TIP='~~~ NOTICE: Your current image is over 1 week old, run `ujust update`. ~~~' else