Skip to content

Commit

Permalink
fixup: use only our one shell location
Browse files Browse the repository at this point in the history
  • Loading branch information
grahamc committed Nov 8, 2023
1 parent eaea148 commit 576f3f6
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/planner/ostree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down

0 comments on commit 576f3f6

Please sign in to comment.