From 938ab8e83b6c9df84e05aaa1aa1f183c9165e370 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Thu, 2 Jan 2025 01:59:03 +0100 Subject: [PATCH] CLI fixes for Fedora --- bin/actions/update.sh | 17 ++++++++++++----- bin/actions/upgrade.sh | 3 +-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/bin/actions/update.sh b/bin/actions/update.sh index ca76e1b..124a926 100755 --- a/bin/actions/update.sh +++ b/bin/actions/update.sh @@ -113,7 +113,7 @@ sys_packages() { nix-channel --update printfe "%s\n" "cyan" "Updating nixos flake..." - cd $HOME/dotfiles/config/nixos && nix flake update + cd $HOME/dotfiles/config/nixos && nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update # Exit if this failed if [ $? -ne 0 ]; then @@ -122,9 +122,16 @@ sys_packages() { return fi - printfe "%s\n" "cyan" "Updating apt packages..." - sudo nala upgrade -y - sudo nala autoremove -y --purge + if [ -x "$(command -v apt)" ]; then + printfe "%s\n" "cyan" "Updating apt packages..." + sudo nala upgrade -y + sudo nala autoremove -y --purge + fi + + if [ -x "$(command -v yum)" ]; then + printfe "%s\n" "cyan" "Updating yum packages..." + sudo yum update -y + fi fi } @@ -163,7 +170,7 @@ flatpakpkgs() { homemanager() { printfe "%s\n" "cyan" "Updating Home Manager flake..." - cd $HOME/dotfiles/config/home-manager && nix flake update + cd $HOME/dotfiles/config/home-manager && nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update } #################################################################################################### diff --git a/bin/actions/upgrade.sh b/bin/actions/upgrade.sh index 92ec834..e99f816 100755 --- a/bin/actions/upgrade.sh +++ b/bin/actions/upgrade.sh @@ -49,8 +49,7 @@ if [[ "$RUN_NIX" == true ]]; then exit 1 fi else - printfe "%s\n" "red" "NixOS is not installed." - exit 1 + printfe "%s\n" "red" "Skipping nixos-rebuild, NixOS is not installed." fi fi