1 |
commit: e2fd0ed7efae55eadfe15572cb6ff0883ae42fcf |
2 |
Author: Georgy Yakovlev <ya <AT> sysdump <DOT> net> |
3 |
AuthorDate: Fri Feb 24 06:27:53 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 3 13:12:22 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2fd0ed7 |
7 |
|
8 |
app-shells/fish: remove profile.env parser |
9 |
|
10 |
This removes profile.env parser and |
11 |
modifies postinst message advising |
12 |
to use bash to launch fish. |
13 |
Fixes bug 545830 |
14 |
Closes: https://github.com/gentoo/gentoo/pull/4072 |
15 |
|
16 |
app-shells/fish/files/profile-env.fish | 23 ----------------------- |
17 |
app-shells/fish/fish-2.5.0.ebuild | 15 ++++----------- |
18 |
2 files changed, 4 insertions(+), 34 deletions(-) |
19 |
|
20 |
diff --git a/app-shells/fish/files/profile-env.fish b/app-shells/fish/files/profile-env.fish |
21 |
deleted file mode 100644 |
22 |
index d4852f04171..00000000000 |
23 |
--- a/app-shells/fish/files/profile-env.fish |
24 |
+++ /dev/null |
25 |
@@ -1,23 +0,0 @@ |
26 |
-# only apply env for login shells, as we'd like fish to |
27 |
-# inherit existing shell environment without overriding it |
28 |
-# using csh env, as it's cleaner and less too parse/strip |
29 |
- |
30 |
-if status --is-login |
31 |
- # since fish supports export via upstream provided function |
32 |
- # we can source directly, only ommiting $PATH and comments. |
33 |
- string match -r -v '^(#|setenv (PATH|ROOTPATH) )' < /etc/csh.env | source |
34 |
- |
35 |
- # strip unneded stuff from setenv lines |
36 |
- # apply paths and cleanup |
37 |
- if [ "$EUID" = "0" ] ; or [ "$USER" = "root" ] |
38 |
- string match -r '^setenv ROOTPATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source |
39 |
- set -gx PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $ROOTPATH |
40 |
- set -e ROOTPATH |
41 |
- else |
42 |
- string match -r '^setenv PATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source |
43 |
- set -gx PATH /usr/local/bin /usr/bin /bin $PATH |
44 |
- end |
45 |
- |
46 |
- # re-prepend $fish_user_paths |
47 |
- __fish_reconstruct_path |
48 |
-end |
49 |
|
50 |
diff --git a/app-shells/fish/fish-2.5.0.ebuild b/app-shells/fish/fish-2.5.0.ebuild |
51 |
index 78465a9f78a..5132a555abc 100644 |
52 |
--- a/app-shells/fish/fish-2.5.0.ebuild |
53 |
+++ b/app-shells/fish/fish-2.5.0.ebuild |
54 |
@@ -32,13 +32,6 @@ src_configure() { |
55 |
--without-included-pcre2 |
56 |
} |
57 |
|
58 |
-src_install() { |
59 |
- default |
60 |
- |
61 |
- insinto /usr/share/fish/vendor_conf.d |
62 |
- newins "${FILESDIR}/profile-env.fish" 00-profile-env.fish |
63 |
-} |
64 |
- |
65 |
src_test() { |
66 |
if has_version ~${CATEGORY}/${P} ; then |
67 |
emake test |
68 |
@@ -51,10 +44,10 @@ pkg_postinst() { |
69 |
elog "fish is now installed on your system." |
70 |
elog "To run fish, type 'fish' in your terminal." |
71 |
elog |
72 |
- elog "To use fish as your login shell:" |
73 |
- elog "* add the line '${EPREFIX}/bin/${PN}'" |
74 |
- elog "* to the file '${EPREFIX}/etc/shells'." |
75 |
- elog "* use the command 'chsh -s ${EPREFIX}/bin/${PN}'." |
76 |
+ elog "It is advised not to set fish as a default login shell." |
77 |
+ elog "see bug #545830 for more details." |
78 |
+ elog "Executing fish using ~/.bashrc is an alternative" |
79 |
+ elog "see https://wiki.gentoo.org/wiki/Fish#Caveats for details" |
80 |
elog |
81 |
elog "To set your colors, run 'fish_config'" |
82 |
elog "To scan your man pages for completions, run 'fish_update_completions'" |