diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-05 20:45:13 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-05 20:45:13 +0000 |
| commit | 8fcdcec5fbdd0e3a77391e4f354218014f59f358 (patch) | |
| tree | b6aaf9c103052f2ab4a948377142f4a4233caa60 /app-shells/bash | |
| parent | 423d21dcfee183cc4b04d29c1621615e8c30f834 (diff) | |
gentoo resync : 05.01.2018
Diffstat (limited to 'app-shells/bash')
| -rw-r--r-- | app-shells/bash/Manifest | 4 | ||||
| -rw-r--r-- | app-shells/bash/bash-4.4_p12.ebuild | 2 | ||||
| -rw-r--r-- | app-shells/bash/files/bashrc | 8 |
3 files changed, 5 insertions, 9 deletions
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 1beafa782e0c..42a8c39a53b8 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -47,7 +47,7 @@ AUX bash-4.3-protos.patch 174 BLAKE2B 02d65bba8a12ab7d280a66d7e292e2ba6eea026fc2 AUX bash-4.4-popd-offset-overflow.patch 1069 BLAKE2B b23ce9f427cdf252aebdf7330828074230f9b22b5bb59b712d1b148ecbf73aea78ce4e29d353198235b25fa19c4046405c8ae6eeb7fd1cf299d05b732f7cc37b SHA512 535f61b2e0c6423031520700be423750e9177ec96055be781aee5dbdd01c720c1dbc30fffa73b88464527981193c1c6a74ec4139753ef4f40a5bb0f55c4de61c AUX bash-4.x-deferred-heredocs.patch 1255 BLAKE2B 944c8d5feaba6a6818fe7e20300fdd44d1e162511c1aaf272bdb4d4c382e100908c16a17e4bef622134116e153f96f61fae4d7985e58cb881012058250a2e7f5 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d -AUX bashrc 3619 BLAKE2B fe710125f7e154294a41457af136658fc96c2fa45629a0c963d59f4dbf2ec1e3ba560495cfff063b1c81fa87815e9c1b1458fcf8f2bd817e106542115090a3c1 SHA512 5cb15b26e14b8a5218ac81b4a7a755de4d0a198036894f506bf51195d7d98085b160529e5b7f1ee5b3ae775abb7a1c17e0a6e2784df6766076df62643eeb75df +AUX bashrc 3555 BLAKE2B 31b62f62632feb74cfadb5b831dd862eace55a603c24c07b50826070f599b0571962b315f7f45edb1a0dba91d7a36fa2b852215e9071012b02d0869cb6e5ab6a SHA512 4c2fded17c5346222939fac5b0a13913bdc062b93a4963ad33fe41cf00a04860b5006ec4c762acb6ce7e36e83f368d5c3427b8bc359ba6cba73d6114f219604e AUX dot-bash_logout 127 BLAKE2B 8290778aea3426f4c56e5a9e7328faa76f99001fc7ce3eeb3ec26624edcd918d7e946da9a63ffcd0cf0f739b528ccb9e764d448276fe4344b69ef2036fdd9921 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd AUX dot-bash_profile 204 BLAKE2B cdb5ece2bea3b47651e2c9ca8d48ef3b0c4b7e2d660632d79edf3cdcea8f5f5a061019739b977538b25f2ace9dcb46e25b30e2d566ea71f6c1ac05388e59c957 SHA512 97ad83696b7eb8b084a53530d1a3e7648722ae4199c91737ceb02b8238e7637b0770731f5140ffb552142311f79b140a041d7e1e5366ba60399b0019f164fce9 AUX dot-bashrc 551 BLAKE2B e245955936f0e036073e7fe153bd01181ae7206a73b45b0411e8d1a6eb0b7131dce260755eed00d2639848eebaefacf7c13087d4315b17f85fbafa6eba4c9fd8 SHA512 518b62aa2fa30e7d1692847929a6ce8dae4eac93e8b16d223d1ae86f4d5b076bcbe1852c9034f321c013e17502db9f771979957c67f8e8a71ca4eea7bfe9cc1b @@ -358,5 +358,5 @@ EBUILD bash-4.1_p17.ebuild 4154 BLAKE2B a8ff6552229406e76b6a9b49f3675630a3910b9a EBUILD bash-4.2_p53.ebuild 4356 BLAKE2B 1043056eed9633f3eca86a89e4ebc595ad7f59f057638088a7e56929d22a4aeb48a410660ecda72ffd5ec43921c067b783bbd8dd2dac4b80b99f03604292e729 SHA512 1bf922d25ededa1ba9f809f1281c0276a220e4f5f1265caddc6a2f095ec9f62f6026b8a9df93002891eeec6252c8943437940fcd08c61543261dbccb523609d2 EBUILD bash-4.3_p39_pre0.ebuild 3581 BLAKE2B 51c88610e9a35420efa938d7bcedc09005a7c86cf5fe45a671607a89e517442f8316667f7883ef87bc5671ed1898097bbc4fd3d5e2d4baa515601cddf8abc8b3 SHA512 f41cf7c82dc1316f61e132a2b29a2e4ac5b7a20f3856b69d51d39a18723c7e4713fec3654331d8bf4425f84d8d43408834d4e63934f7369232d87ce12156d2a2 EBUILD bash-4.3_p48-r1.ebuild 7260 BLAKE2B 82316e5db3a371f6856b0a22020b34842bf6d5313a0391d21e009c98381464c901638f7247a9eb38d72452c29f996629b3c8b4b53f894cba54b0d375b5f77aed SHA512 7b15ebc166dd814164deddd0821650b4d66e77ce35ee0d3d57682c1b404be4f7ed9437af1fd6bf58696849bd5e9d23d6d92701f44bed2d09362dc3aa3a2b715a -EBUILD bash-4.4_p12.ebuild 7180 BLAKE2B 443e0432c2b0611d1ce4b39123348ee8bafbdf00dfa216a8f74e7e50261a39d0351cb99bb13b8f38c4e1ba6f7c2acf27d133862dff6184306a9a2e19f2d2866f SHA512 17ec95445425be9554486aea25f50267e51b498370be676c599dd82ab80a94a3a1e41b5e39ad9c66f52733311ad6575efd2b5df5b83708d93c8ba6801bcd9046 +EBUILD bash-4.4_p12.ebuild 7179 BLAKE2B 3260cefee31ef611ba4fae738ad01ed8b16142bcf04f8598fa2c0974963b863249d2bc806de645acd528d75145b2f7893c63ac3e2d35530c7d9bc258f2cf7bb7 SHA512 e3caf500fe0760b7b8ad873392e7964731ec6304926bed9983ccbb6b126c2844a8cca916a4d6966967d9c16f3151362982d9e898ca858367cc106250bc0780a4 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1 diff --git a/app-shells/bash/bash-4.4_p12.ebuild b/app-shells/bash/bash-4.4_p12.ebuild index 7cbe43f960c1..1ac5358391fd 100644 --- a/app-shells/bash/bash-4.4_p12.ebuild +++ b/app-shells/bash/bash-4.4_p12.ebuild @@ -46,7 +46,7 @@ fi LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" DEPEND=">=sys-libs/ncurses-5.2-r2:0= diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc index 03694691d4a7..8d9c29738b62 100644 --- a/app-shells/bash/files/bashrc +++ b/app-shells/bash/files/bashrc @@ -97,12 +97,8 @@ if ${use_color} ; then alias egrep='egrep --colour=auto' alias fgrep='fgrep --colour=auto' else - if [[ ${EUID} == 0 ]] ; then - # show root@ when we don't have colors - PS1+='\u@\h \w \$ ' - else - PS1+='\u@\h \w \$ ' - fi + # show root@ when we don't have colors + PS1+='\u@\h \w \$ ' fi for sh in /etc/bash/bashrc.d/* ; do |