| 1 |
commit: d2e4f983d7ac7732c631dcada21fe44b7c0dc25d |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 6 00:50:51 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 6 00:50:51 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e4f983 |
| 7 |
|
| 8 |
Revert "app-shells/fish: Removed old." |
| 9 |
|
| 10 |
This reverts commit 6529c95301c9f8d936869dd0496c88cffbab2aa1. |
| 11 |
|
| 12 |
Wrong commit message. Did bump and remove in one commit. |
| 13 |
|
| 14 |
app-shells/fish/Manifest | 1 - |
| 15 |
app-shells/fish/files/profile-env.fish | 34 +++++++++------------- |
| 16 |
.../{fish-2.5.0.ebuild => fish-2.4.0-r1.ebuild} | 0 |
| 17 |
3 files changed, 13 insertions(+), 22 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest |
| 20 |
index 858f28c..bc12de2 100644 |
| 21 |
--- a/app-shells/fish/Manifest |
| 22 |
+++ b/app-shells/fish/Manifest |
| 23 |
@@ -1,2 +1 @@ |
| 24 |
DIST fish-2.4.0.tar.gz 3455874 SHA256 06bbb2323360439c4044da762d114ec1aa1aba265cec71c0543e6a0095c9efc5 SHA512 b27a2291c284fda7a12b3cd5dcba8dfcbf2738f50de40d9aac1500afa3bd98be04b4f67d7e6d3bb2f808c11a8c2dd6b1b5cc2dfe3e8e0e7d1bc88f8d8994d57b WHIRLPOOL abb9c31237a33553b25920fe3284f4ca90941aed2b8f1ec4b69fdb4231f7b2585f0292bc647ffe3acf88f6b01ac61931f615fa9a56ede35a8182e3a69aa11861 |
| 25 |
-DIST fish-2.5.0.tar.gz 3496831 SHA256 f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5 SHA512 6d94bb70a5f1cefaada4d10ac845992f87c9bfc8c253f38bdfcc3a573a35503d825c9487d2ce8ef3819713594ab7b54ebf6c89fe3362c7010c63dbefc99b424d WHIRLPOOL a16d5f75e95573f2b766527fb124d99083a7ab84522a4826cd5b3aaf3a73ae6728f30defbd0598698b496f279f686eddcb4e81779767e89888037abe0b908849 |
| 26 |
|
| 27 |
diff --git a/app-shells/fish/files/profile-env.fish b/app-shells/fish/files/profile-env.fish |
| 28 |
index af3b133..21a918a 100644 |
| 29 |
--- a/app-shells/fish/files/profile-env.fish |
| 30 |
+++ b/app-shells/fish/files/profile-env.fish |
| 31 |
@@ -1,23 +1,15 @@ |
| 32 |
-# only apply env for login shells, as we'd like fish to |
| 33 |
-# inherit existing shell environment without overriding it |
| 34 |
-# using csh env, as it's cleaner and less too parse/strip |
| 35 |
+# since fish supports export via upstream provided function |
| 36 |
+# we can source directly, only ommiting $PATH and comments. |
| 37 |
+grep -Ev "^(#|export (PATH|ROOTPATH)=)" /etc/profile.env | source |
| 38 |
|
| 39 |
-if status --is-login |
| 40 |
- # since fish supports export via upstream provided function |
| 41 |
- # we can source directly, only ommiting $PATH and comments. |
| 42 |
- string match -r -v '^(#|setenv (PATH|ROOTPATH) )' < /etc/csh.env | source |
| 43 |
- |
| 44 |
- # strip unneded stuff from setenv lines |
| 45 |
- # apply paths and cleanup |
| 46 |
- if [ "$EUID" = "0" ] ; or [ "$USER" = "root" ] |
| 47 |
- string match -r '^setenv ROOTPATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source |
| 48 |
- set -gx PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $ROOTPATH |
| 49 |
- set -e ROOTPATH |
| 50 |
- else |
| 51 |
- string match -r '^setenv PATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source |
| 52 |
- set -gx PATH /usr/local/bin /usr/bin /bin $PATH |
| 53 |
- end |
| 54 |
- |
| 55 |
- # re-prepend $fish_user_paths |
| 56 |
- __fish_reconstruct_path |
| 57 |
+# strip unneded stuff from bash export lines |
| 58 |
+# apply paths and cleanup |
| 59 |
+if [ "$EUID" = "0" ] ; or [ "$USER" = "root" ] |
| 60 |
+ set _rootpath (grep -o " ROOTPATH='.*'" /etc/profile.env | sed "s@.*'\(.*\)'@\1@;s@:@\n@g") |
| 61 |
+ set -xg PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $_rootpath |
| 62 |
+ set -e _rootpath |
| 63 |
+else |
| 64 |
+ set _userpath (grep -o " PATH='.*'" /etc/profile.env | sed "s@.*'\(.*\)'@\1@;s@:@\n@g") |
| 65 |
+ set -xg PATH /usr/local/bin /usr/bin /bin $_userpath |
| 66 |
+ set -e _userpath |
| 67 |
end |
| 68 |
|
| 69 |
diff --git a/app-shells/fish/fish-2.5.0.ebuild b/app-shells/fish/fish-2.4.0-r1.ebuild |
| 70 |
similarity index 100% |
| 71 |
rename from app-shells/fish/fish-2.5.0.ebuild |
| 72 |
rename to app-shells/fish/fish-2.4.0-r1.ebuild |
Archives