From 1c544a116091153e318bded35d840617ca7208f0 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 4 Oct 2024 18:40:35 +0200 Subject: fix(common/init): Ignore the init script itself, when looking for leftover `%INIT_`s --- common/init | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/init b/common/init index b645441..8d8a2d0 100644 --- a/common/init +++ b/common/init @@ -1,7 +1,10 @@ #!/usr/bin/env sh +self_dir="$(realpath "$(dirname "$0")")" +self="$(realpath "$0")" + # shellcheck source=/dev/null -. "$(realpath "$(dirname "$0")")/shell_line_editor.sh" +. "$self_dir/shell_line_editor.sh" replacement_file="$(mktemp)" @@ -181,9 +184,9 @@ while read -r var; do done done <"$replacement_file" -if [ "$(rg "%INIT_" --files-with-matches | wc -l)" -ne 0 ]; then +if [ "$(rg "%INIT_" --files-with-matches --glob="!/init" | wc -l)" -ne 0 ]; then echo "Following init variables were not replaced. This is a bug." - rg "%INIT_" + rg "%INIT_" --glob="!/init" fi # HACK: Re-add the executable permissions to files, which the nix template has somehow -- cgit 1.4.1