fish-foreign-env: suppress additional harmless warnings
As per #30645, fish with fish-foreign-env prints this (harmless) warning: ``` set: Tried to change the read-only variable “_” ``` This patch was developed by @rnhmjoj in the aforementioned issue discussion
This commit is contained in:
parent
ce8dea6bdd
commit
edfdc1d818
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
-i $out/share/fish-foreign-env/functions/*
|
||||
'';
|
||||
|
||||
patches = [ ./hide-path-warnings.patch ];
|
||||
patches = [ ./suppress-harmless-warnings.patch ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A foreign environment interface for Fish shell";
|
||||
|
@ -1,16 +1,23 @@
|
||||
diff --git a/functions/fenv.apply.fish b/functions/fenv.apply.fish
|
||||
index 34a25e3..6837e7f 100644
|
||||
index 34a25e3..3d94135 100644
|
||||
--- a/functions/fenv.apply.fish
|
||||
+++ b/functions/fenv.apply.fish
|
||||
@@ -30,8 +30,9 @@ function fenv.apply
|
||||
@@ -27,11 +27,17 @@ function fenv.apply
|
||||
for variable in $variables
|
||||
set key (echo $variable | sed 's/=.*//')
|
||||
set value (echo $variable | sed 's/[^=]*=//')
|
||||
+ set ignore PATH _
|
||||
|
||||
if test "$key" = 'PATH'
|
||||
set value (echo $value | tr ':' '\n')
|
||||
end
|
||||
|
||||
- set -g -x $key $value
|
||||
+ if contains $key $ignore
|
||||
+ set -g -x $key $value ^/dev/null
|
||||
+ else
|
||||
+ set -g -x $key $value
|
||||
end
|
||||
-
|
||||
- set -g -x $key $value
|
||||
+ end
|
||||
+
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue
Block a user