scottk/secureblue
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/secureblue.git synced 2025-11-03 20:07:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: various motd improvements

Browse Source
This commit is contained in:
qoijjj
2024-03-07 16:26:48 -08:00
parent f4104d4156
commit 731282e84d
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
config/files/usr/libexec/ublue-motd
View File

@@ -1,27 +1,25 @@
#!/usr/bin/bash #!/usr/bin/bash
# Modified from https://github.com/ublue-os/bazzite/blob/main/system_files/desktop/shared/usr/libexec/ublue-motd # Modified from https://github.com/ublue-os/bazzite/blob/main/system_files/desktop/shared/usr/libexec/ublue-motd
escape() {
sed 's/[&/\]/\\&/g' <<< "$1"
}
IMAGE_INFO="/usr/share/ublue-os/image-info.json" IMAGE_INFO="/usr/share/ublue-os/image-info.json"
IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO) IMAGE_REF=$(jq -r '."image-ref"' < $IMAGE_INFO)
IMAGE_NAME_ESCAPED=$(escape "$IMAGE_NAME") IMAGE_REF_NAME="${IMAGE_REF##*/}"
IMAGE_TAG=$(jq -r '."image-tag"' < $IMAGE_INFO) IMAGE_TAG=$(jq -r '."image-tag"' < $IMAGE_INFO)
IMAGE_TAG_ESCAPED=$(escape "$IMAGE_TAG")
TIP="" TIP=""
IMAGE_DATE=$(rpm-ostree status --booted | sed -n 's/.*Timestamp: \(.*\)/\1/p') IMAGE_DATE=$(rpm-ostree status --booted | sed -n 's/.*Timestamp: \(.*\)/\1/p')
IMAGE_DATE_SECONDS=$(date -d "$IMAGE_DATE" +%s) IMAGE_DATE_SECONDS=$(date -d "$IMAGE_DATE" +%s)
CURRENT_SECONDS=$(date +%s) CURRENT_SECONDS=$(date +%s)
DIFFERENCE=$((CURRENT_SECONDS - IMAGE_DATE_SECONDS)) DIFFERENCE=$((CURRENT_SECONDS - IMAGE_DATE_SECONDS))
MONTH=$((30 * 24 * 60 * 60)) MONTH=$((7 * 24 * 60 * 60))
if [ "$DIFFERENCE" -ge "$MONTH" ]; then if [ "$DIFFERENCE" -ge "$MONTH" ]; then
TIP='# 󰇻 Your current image is over 1 month old, run `ujust update`' TIP='~~~ NOTICE: Your current image is over 1 week old, run `ujust update`. ~~~'
else
TIP='~~~ NOTICE: There is currently no notice. ~~~'
fi fi
TIP_ESCAPED=$(escape "$TIP") TIP_OUTPUT=$(sed -e "s/%IMAGE_REF_NAME%/$IMAGE_REF_NAME/g" -e "s/%IMAGE_TAG%/$IMAGE_TAG/g" -e "s/%TIP%/$TIP/g" /usr/share/ublue-os/motd/secureblue.txt)
while IFS= read -r line; do
TIP_OUTPUT=sed -e "s/%IMAGE_NAME%/$IMAGE_NAME_ESCAPED/g" -e "s/%IMAGE_TAG%/$IMAGE_TAG_ESCAPED/g" -e "s/%TIP%/$TIP_ESCAPED/g" /usr/share/ublue-os/motd/secureblue.txt | tr '~' '\n' echo "$line"
echo $TIP_OUTPUT done <<< $TIP_OUTPUT

6
config/files/usr/share/ublue-os/motd/secureblue.txt
View File

@@ -1,11 +1,13 @@
Welcome to secureblue! Welcome to secureblue!
Your image is: %IMAGE_NAME%:%IMAGE_TAG% Your image is: %IMAGE_REF_NAME%:%IMAGE_TAG%
Commands: Commands:
| `ujust` | List all available commands | | `ujust` | List all available commands |
| `ujust toggle-user-motd` | Toggle this banner on/off | | `ujust toggle-user-motd` | Toggle this banner on/off |
%TIP% %TIP%
To report an issue: https://github.com/secureblue/secureblue/issues To report an issue: https://github.com/secureblue/secureblue/issues
FAQ: https://github.com/secureblue/secureblue/blob/live/FAQ.md FAQ: https://github.com/secureblue/secureblue/blob/live/FAQ.md
Discord: https://discord.gg/qMTv5cKfbF Discord: https://discord.gg/qMTv5cKfbF