From c47dfde776336a33d3a57503460703b91347e2b3 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Thu, 8 Feb 2024 17:26:05 -0800 Subject: [PATCH] Fix profile comparison: Don't use full path where name is expected Bug: Yikes! This deleted the current profile on a machine that hadn't been started in awhile. :( --- modules/profile-gc.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/profile-gc.nix b/modules/profile-gc.nix index 5444798..3a2e44a 100644 --- a/modules/profile-gc.nix +++ b/modules/profile-gc.nix @@ -179,7 +179,8 @@ in { echo "(Disregarding unrelated profile $p)" >&2 continue fi - if [[ "$p" == "$current" ]];then + pname=$(${pkgs.coreutils}/bin/basename "$p") + if [[ "$pname" == "$current" ]];then echo "Keeeping current profile $p" >&2 continue fi @@ -187,7 +188,7 @@ in { echo "Keeeping active system/boot profile $p" >&2 continue fi - if [[ "''${active[$p]:-}" ]];then + if [[ "''${active[$pname]:-}" ]];then echo "Keeeping active profile $p" >&2 continue fi -- 2.44.1