diff options
-rwxr-xr-x | pkgs/update.sh | 2 | ||||
-rwxr-xr-x | update.sh | 19 |
2 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/update.sh b/pkgs/update.sh index 73132a0f..0a8c4cfc 100755 --- a/pkgs/update.sh +++ b/pkgs/update.sh @@ -28,7 +28,7 @@ fd . --type directory --max-depth 1 | while read -r shard; do cd "$package" || die "(BUG): Package '$package' does not exist?" if [ -x update.sh ]; then - printf "\033[34;1m> \033[0m\033[34;1m%s\033[0m\n" "Running '${shard}${package}update.sh' .." + printf " \033[34;1m> \033[0m\033[34;1m%s\033[0m\n" "Running '${shard}${package}update.sh' .." [ -f flake.nix ] && nix flake update diff --git a/update.sh b/update.sh index 795bae99..631c9d75 100755 --- a/update.sh +++ b/update.sh @@ -1,8 +1,17 @@ -#!/bin/sh -# shellcheck disable=SC2086 +#!/usr/bin/env sh +run() { + printf "\033[35;1m> \033[0m\033[35;1m%s\033[0m\n" "Running $(basename "$1") .." -./hm/soispha/conf/firefox/scripts/update_extensions.sh + cmd="$1"; + shift 1 -./sys/nixpkgs/pkgs/update_pkgs.sh "$@" + "$cmd" "$@" +} -./sys/secrets/update.sh +run ./modules/home/conf/firefox/scripts/update_extensions.sh + +run ./pkgs/update_pkgs.sh "$@" + +run ./modules/system/secrets/update_secrets.sh + +# vim: ft=sh |