From 697964e27958e1bfd69637559b1479c777bde64d Mon Sep 17 00:00:00 2001 From: madonuko Date: Sun, 4 Aug 2024 20:59:25 +0800 Subject: [PATCH 1/4] feat(shell-config): add neofetch message --- .../shell-config/ultramarine-shell-config.spec | 2 +- ultramarine/shell-config/ultramarine-shell.sh | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ultramarine/shell-config/ultramarine-shell-config.spec b/ultramarine/shell-config/ultramarine-shell-config.spec index 70b8298..7f67460 100644 --- a/ultramarine/shell-config/ultramarine-shell-config.spec +++ b/ultramarine/shell-config/ultramarine-shell-config.spec @@ -1,6 +1,6 @@ Name: ultramarine-shell-config -Version: 1.2.4 +Version: 1.2.5 Release: 1%{?dist} Summary: Shell configuration for Ultramarine Linux License: MIT diff --git a/ultramarine/shell-config/ultramarine-shell.sh b/ultramarine/shell-config/ultramarine-shell.sh index 0ddf2c6..30fc9f5 100755 --- a/ultramarine/shell-config/ultramarine-shell.sh +++ b/ultramarine/shell-config/ultramarine-shell.sh @@ -61,6 +61,19 @@ alias yay=_aur_helper alias pacaur=_aur_helper alias paru=_aur_helper +if ! [ -x "$(command -v neofetch)" ]; then + neofetch() { + echo 'neofetch is not installed.' + echo 'While it is available via `sudo dnf in neofetch`, it does not come with the Ultramarine logo.' + echo 'We recommend fastfetch instead, which may be installed via:' + echo + echo ' sudo dnf in fastfetch' + echo + echo 'You may disable this message by installing hyfetch-neofetch or neofetch.' + return 1 + } +fi + # if ~/.config/starship.toml doesn't exist if ! [ -f ~/.config/starship.toml ]; then # export another starship config From bc53260aac3839b083ef7a181c0f314cc7f12e6e Mon Sep 17 00:00:00 2001 From: madonuko Date: Sun, 4 Aug 2024 21:01:32 +0800 Subject: [PATCH 2/4] feat(shell-config): build as noarch Signed-off-by: madonuko --- ultramarine/shell-config/anda.hcl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ultramarine/shell-config/anda.hcl b/ultramarine/shell-config/anda.hcl index 5183fc5..312eff7 100644 --- a/ultramarine/shell-config/anda.hcl +++ b/ultramarine/shell-config/anda.hcl @@ -1,6 +1,7 @@ project "pkg" { + arches = ["x86_64"] rpm { spec = "ultramarine-shell-config.spec" sources = "." } -} \ No newline at end of file +} From 8445c3afd0eaf5b2a7aa5d43fd7280d5146365cf Mon Sep 17 00:00:00 2001 From: madonuko Date: Mon, 5 Aug 2024 16:16:12 +0800 Subject: [PATCH 3/4] fix(shell-config): better wording for neofetch message --- ultramarine/shell-config/ultramarine-shell.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ultramarine/shell-config/ultramarine-shell.sh b/ultramarine/shell-config/ultramarine-shell.sh index 30fc9f5..a28645f 100755 --- a/ultramarine/shell-config/ultramarine-shell.sh +++ b/ultramarine/shell-config/ultramarine-shell.sh @@ -63,11 +63,11 @@ alias paru=_aur_helper if ! [ -x "$(command -v neofetch)" ]; then neofetch() { - echo 'neofetch is not installed.' - echo 'While it is available via `sudo dnf in neofetch`, it does not come with the Ultramarine logo.' - echo 'We recommend fastfetch instead, which may be installed via:' + echo 'Neofetch is not installed.' + echo 'While neofetch is available in Ultramarine, it does not come with our logo, and is no longer maintained.' + echo 'We recommend fastfetch instead, which may be installed using:' echo - echo ' sudo dnf in fastfetch' + echo ' sudo dnf install fastfetch' echo echo 'You may disable this message by installing hyfetch-neofetch or neofetch.' return 1 From 33ea78a245fc90724d616bcfe1d766b28486d1f2 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 19 Aug 2024 16:16:24 +0800 Subject: [PATCH 4/4] fix(shell-config): no more neofetch --- ultramarine/shell-config/ultramarine-shell.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ultramarine/shell-config/ultramarine-shell.sh b/ultramarine/shell-config/ultramarine-shell.sh index a28645f..55d7188 100755 --- a/ultramarine/shell-config/ultramarine-shell.sh +++ b/ultramarine/shell-config/ultramarine-shell.sh @@ -64,12 +64,12 @@ alias paru=_aur_helper if ! [ -x "$(command -v neofetch)" ]; then neofetch() { echo 'Neofetch is not installed.' - echo 'While neofetch is available in Ultramarine, it does not come with our logo, and is no longer maintained.' + echo 'Neofetch is no longer maintained, and it does not come with our logo.' echo 'We recommend fastfetch instead, which may be installed using:' echo echo ' sudo dnf install fastfetch' echo - echo 'You may disable this message by installing hyfetch-neofetch or neofetch.' + echo 'You may disable this message by installing hyfetch-neofetch.' return 1 } fi