From 78659c41c09a0b7cd7cd3222a838b01876d9fcb0 Mon Sep 17 00:00:00 2001 From: "Gustavo \"Guz\" L. de Mello" Date: Tue, 9 Apr 2024 13:26:52 -0300 Subject: [PATCH] refactor: moved diff creation to it's own utility function --- modules/nixos/programs/nih/cli.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/nixos/programs/nih/cli.sh b/modules/nixos/programs/nih/cli.sh index 2a64a10..d044e55 100644 --- a/modules/nixos/programs/nih/cli.sh +++ b/modules/nixos/programs/nih/cli.sh @@ -1,4 +1,15 @@ +function util-show-diff() { + local prefix="$1"; + + gum log --structured --prefix "$prefix" --level debug 'Creatting diff files' + temp_file="$(mktemp /tmp/nih-diff-XXXXX)" + git diff -U0 '*.*' > $temp_file + echo "$(gum format -l diff -t code < $temp_file)" > $temp_file + gum pager < $temp_file + rm $temp_file +} + function nih-edit() { local flake_dir="$1" local host="$2" @@ -32,12 +43,7 @@ function nih-edit() { && exit 1) # Show modifications - gum log --structured --prefix 'nih edit' --level debug 'Creatting diff files' - temp_file="$(mktemp /tmp/nih-diff-XXXXX)" - git diff -U0 '*.nix' > $temp_file - echo "$(gum format -l diff -t code < $temp_file)" > $temp_file - gum pager < $temp_file - rm $temp_file + util-show-diff 'nih edit' # Add secret files gum log --structured --prefix 'nih edit' --level debug 'Adding decrypted secret files'