From 89c8c729fac68ca4c499e071db16c7078a917739 Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Thu, 3 Oct 2024 15:38:03 +0200 Subject: [PATCH] added show-trace option to rebuild --- rebuild.sh | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/rebuild.sh b/rebuild.sh index 630a2b4..a4b7fdc 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -7,6 +7,8 @@ else preserve_result=false fi +show_trace=false + while [ $# -gt 0 ]; do case "$1" in --target*|-t*) @@ -31,6 +33,9 @@ while [ $# -gt 0 ]; do --no-preserve-result) preserve_result=false ;; + --show-trace) + show_trace=true + ;; --help|-h) echo "--help -h: print this message" echo "--target -t: set the target system to rebuild on" @@ -39,6 +44,7 @@ while [ $# -gt 0 ]; do echo "--user -u: set the user to rebuild flake as on the target system" echo "--preserve-result: do not remove the generated result folder after building" echo "--no-preserve-result: remove any result folder after building" + echo "--show-trace: show trace on builds" exit 0 ;; *) @@ -54,15 +60,20 @@ flake=${flake:-$target} mode=${mode:-switch} user=${user:-$USER} -# path: prefixes on rebuilds here make nix not treat this flake like it has a git repo so we can -# access secret files in the submodule this is kinda bad and we should find a way to not need it -if [[ "$target" == "$(hostname)" ]]; +command="nixos-rebuild $mode --use-remote-sudo --flake .#$flake" + +if [[ "$target" != "$(hostname)" ]]; then - nixos-rebuild $mode --use-remote-sudo --flake .#$flake -else - nixos-rebuild $mode --use-remote-sudo --target-host $user@$target --flake .#$flake + command="$command --target-host $user@$target" fi +if [[ "$show_trace" = true ]]; +then + command="$command --show-trace" +fi + +$command + if [ -d "result" ]; then if [[ "$preserve_result" == "false" ]];