From d1f6e8fa73623feda4ef0f232fe65c59d3437378 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 24 May 2024 18:21:04 +0200 Subject: fix(update.sh): Use more descriptive names for the toplevel update.sh scripts --- pkgs/update.sh | 44 -------------------------------------------- pkgs/update_pkgs.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 44 deletions(-) delete mode 100755 pkgs/update.sh create mode 100755 pkgs/update_pkgs.sh (limited to 'pkgs') diff --git a/pkgs/update.sh b/pkgs/update.sh deleted file mode 100755 index 0a8c4cfc..00000000 --- a/pkgs/update.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env sh - -die() { - printf "\033[31;1mError: \033[0m%s\n" "$1" - exit 1 -} - -cd "$(dirname "$0")" || die "Bug: run with the wrong first arg: '$0'!" -cd ./by-name || die "(BUG): The directory './by-name' does not exist?" - -# First check if all the update scripts conform to the standard -files_with_update="$(mktemp)"; -trap 'rm "$files_with_update"' EXIT - -fd '^update.sh$' . --type file --extension sh --max-depth 3 | while read -r file; do - grep -q "nix flake update" "$file" && echo "$file" >> "$files_with_update" -done - -if [ "$(wc -l < "$files_with_update")" != 0 ]; then - die "Some packages seem to try to update their flake with 'nix flake update'. This is redundant. These Packages are: $(echo && cat "$files_with_update")" -fi - -# Than actually perform the update -fd . --type directory --max-depth 1 | while read -r shard; do - cd "$shard" || die "(BUG): Shard '$shard' does not exist?" - - fd . --type directory --max-depth 1 | while read -r package; 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' .." - - [ -f flake.nix ] && nix flake update - - direnv allow - eval "$(direnv export bash 2>/dev/null)" - ./update.sh "$@" - fi - cd - >/dev/null || die "Bug: Last dir does not exist" - done - cd - >/dev/null || die "Bug: Last dir does not exist" -done - -# vim: ft=sh diff --git a/pkgs/update_pkgs.sh b/pkgs/update_pkgs.sh new file mode 100755 index 00000000..0a8c4cfc --- /dev/null +++ b/pkgs/update_pkgs.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env sh + +die() { + printf "\033[31;1mError: \033[0m%s\n" "$1" + exit 1 +} + +cd "$(dirname "$0")" || die "Bug: run with the wrong first arg: '$0'!" +cd ./by-name || die "(BUG): The directory './by-name' does not exist?" + +# First check if all the update scripts conform to the standard +files_with_update="$(mktemp)"; +trap 'rm "$files_with_update"' EXIT + +fd '^update.sh$' . --type file --extension sh --max-depth 3 | while read -r file; do + grep -q "nix flake update" "$file" && echo "$file" >> "$files_with_update" +done + +if [ "$(wc -l < "$files_with_update")" != 0 ]; then + die "Some packages seem to try to update their flake with 'nix flake update'. This is redundant. These Packages are: $(echo && cat "$files_with_update")" +fi + +# Than actually perform the update +fd . --type directory --max-depth 1 | while read -r shard; do + cd "$shard" || die "(BUG): Shard '$shard' does not exist?" + + fd . --type directory --max-depth 1 | while read -r package; 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' .." + + [ -f flake.nix ] && nix flake update + + direnv allow + eval "$(direnv export bash 2>/dev/null)" + ./update.sh "$@" + fi + cd - >/dev/null || die "Bug: Last dir does not exist" + done + cd - >/dev/null || die "Bug: Last dir does not exist" +done + +# vim: ft=sh -- cgit 1.4.1