From 576f3f688f6c89fdabee5509f4c7faa0067a9cf1 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 8 Nov 2023 14:32:27 -0500 Subject: [PATCH] fixup: use only our one shell location --- src/planner/ostree.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/planner/ostree.rs b/src/planner/ostree.rs index d5825f6f4..44dec31b7 100644 --- a/src/planner/ostree.rs +++ b/src/planner/ostree.rs @@ -31,7 +31,7 @@ use super::{ // This may not be suitable for all possible ostree based distros, but it'll fix // a good number of selftest failures we're seeing. // -// See: #707 +// See: https://github.com/DeterminateSystems/nix-installer/issues/707 pub const OSTREE_FISH_PROFILE_LOCATION: &str = "/usr/local/share/fish/"; /// A planner suitable for immutable systems using ostree, such as Fedora Silverblue @@ -171,10 +171,8 @@ impl Planner for Ostree { .iter() .position(|v| *v == PathBuf::from("/usr/share/fish/")) { - shell_profile_locations - .fish - .vendor_confd_prefixes - .remove(index); + shell_profile_locations.fish.vendor_confd_prefixes = + &[OSTREE_FISH_PROFILE_LOCATION.into()]; } plan.push(