fix: zfs depmod, zfs autoload

fix: rollback helper use stable

fix: bluefin-cli only source and run commands if it exists and commands
are available

build_files/base/install-akmods.sh

@@ -37,8 +37,8 @@ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.r
 
 # ZFS for gts/stable
 if [[ -n "${COREOS_TYPE:-}" ]]; then
-    KERNEL_FOR_DEPMOD="$(rpm -q kernel --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
     rpm-ostree install /tmp/akmods-rpms/kmods/zfs/*.rpm \
                        pv
-    depmod -A "${KERNEL_FOR_DEPMOD}"
+    depmod -a -v "${KERNEL}".x86_64
+    echo "zfs" > /usr/lib/modules-load.d/zfs.conf
 fi

system_files/shared/usr/bin/ublue-rollback-helper

@@ -14,7 +14,7 @@ function list_tags(){
 function rebase_helper(){
     base_image="ghcr.io/ublue-os/${IMAGE_NAME}"
     echo "Which Tag would you like to rebase to?"
-    choose_target=$(Choose date latest gts coreos cancel)
+    choose_target=$(Choose date latest gts stable cancel)
     if [[ "$choose_target" != "date" && "$choose_target" != "cancel" ]]; then
         rebase_target="${base_image}:${choose_target}"
     elif [[ "$choose_target" == "date" ]]; then

system_files/shared/usr/libexec/ublue-bling.sh

@@ -69,21 +69,21 @@ if [[ "${shell}" == "fish" ]]; then
     echo 'Adding bling to your config.fish 🐟🐟🐟'
     cat<<-EOF >> "${XDG_CONFIG_HOME:-$HOME/.config}/fish/config.fish"
 ### bling.fish source start
-source /usr/share/ublue-os/bluefin-cli/bling.fish
+test -f /usr/share/ublue-os/bluefin-cli/bling.fish && source /usr/share/ublue-os/bluefin-cli/bling.fish
 ### bling.fish source end
 EOF
 elif [[ "${shell}" == "zsh" ]]; then
     echo 'Adding bling to your .zshrc 💤💤💤'
     cat<<-EOF >> "${ZDOTDIR:-$HOME}/.zshrc"
 ### bling.sh source start
-source /usr/share/ublue-os/bluefin-cli/bling.sh
+test -f /usr/share/ublue-os/bluefin-cli/bling.sh && source /usr/share/ublue-os/bluefin-cli/bling.sh
 ### bling.sh source end
 EOF
 elif [[ "${shell}" == "bash" ]]; then
     echo 'Adding bling to your .bashrc 💥💥💥'
     cat<<-EOF >> "${HOME}/.bashrc"
 ### bling.sh source start
-source /usr/share/ublue-os/bluefin-cli/bling.sh
+test -f /usr/share/ublue-os/bluefin-cli/bling.sh && source /usr/share/ublue-os/bluefin-cli/bling.sh
 ### bling.sh source end
 EOF
 else

system_files/shared/usr/share/ublue-os/bluefin-cli/bling.fish

@@ -1,18 +1,22 @@
 # ls aliases
-alias ll='eza -l --icons=auto --group-directories-first'
-alias l.='eza -d .*'
-alias ls='eza'
-alias l1='eza -1'
+if [ "$(command -v eza)" ]
+    alias ll='eza -l --icons=auto --group-directories-first'
+    alias l.='eza -d .*'
+    alias ls='eza'
+    alias l1='eza -1'
+end
 
 # ugrep for grep
-alias grep='ug'
-alias egrep='ug -E'
-alias fgrep='ug -F'
-alias xzgrep='ug -z'
-alias xzegrep='ug -zE'
-alias xzfgrep='ug -zF'
+if [ "$(command -v ug)" ]
+    alias grep='ug'
+    alias egrep='ug -E'
+    alias fgrep='ug -F'
+    alias xzgrep='ug -z'
+    alias xzegrep='ug -zE'
+    alias xzfgrep='ug -zF'
+end
 
 if status is-interactive
-    eval "$(atuin init fish)"
-    eval "$(zoxide init fish)"
+    [ "$(command -v atuin)" ] && eval "$(atuin init fish)"
+    [ "$(command -v zoxide)" ] && eval "$(zoxide init fish)"
 end

system_files/shared/usr/share/ublue-os/bluefin-cli/bling.sh

@@ -1,25 +1,29 @@
 #!/usr/bin/env sh
 
 # ls aliases
-alias ll='eza -l --icons=auto --group-directories-first'
-alias l.='eza -d .*'
-alias ls='eza'
-alias l1='eza -1'
+if [ "$(command -v eza)" ]; then
+    alias ll='eza -l --icons=auto --group-directories-first'
+    alias l.='eza -d .*'
+    alias ls='eza'
+    alias l1='eza -1'
+fi
 
 # ugrep for grep
-alias grep='ug'
-alias egrep='ug -E'
-alias fgrep='ug -F'
-alias xzgrep='ug -z'
-alias xzegrep='ug -zE'
-alias xzfgrep='ug -zF'
+if [ "$(command -v ug)" ]; then
+    alias grep='ug'
+    alias egrep='ug -E'
+    alias fgrep='ug -F'
+    alias xzgrep='ug -z'
+    alias xzegrep='ug -zE'
+    alias xzfgrep='ug -zF'
+fi
 
 if [ "$(basename "$SHELL")" = "bash" ]; then
     #shellcheck disable=SC1091
     . /usr/share/bash-prexec
-    eval "$(atuin init bash)"
-    eval "$(zoxide init bash)"
+    [ "$(command -v atuin)" ] && eval "$(atuin init bash)"
+    [ "$(command -v zoxide)" ] && eval "$(zoxide init bash)"
 elif [ "$(basename "$SHELL")" = "zsh" ]; then
-    eval "$(atuin init zsh)"
-    eval "$(zoxide init zsh)"
+    [ "$(command -v atuin)" ] && eval "$(atuin init zsh)"
+    [ "$(command -v zoxide)" ] && eval "$(zoxide init zsh)"
 fi