diff options
| author |   Stuart Shelton <stuart@shelton.me> | 2016-12-06 18:09:26 +0000 |
|---|---|---|
| committer | Stuart Shelton <stuart@shelton.me> | 2016-12-06 18:09:26 +0000 |
| commit | b5fbe7b1def9d2f8923513a18992fef6b54c557e (patch) | |
| tree | b5b6883a3d14e62fda7a698d6ba355773bdb27f0 /app-shells | |
| parent | Update net-fs/samba-4.2.11 (diff) | |
| download | srcshelton-b5fbe7b1def9d2f8923513a18992fef6b54c557e.tar.gz srcshelton-b5fbe7b1def9d2f8923513a18992fef6b54c557e.tar.bz2 srcshelton-b5fbe7b1def9d2f8923513a18992fef6b54c557e.zip | |
Update file bashrc-prefix.patch, affecting app-shells/bash
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash/Manifest | 2 | ||||
| -rw-r--r-- | app-shells/bash/files/bashrc-prefix.patch | 42 |
2 files changed, 23 insertions, 21 deletions
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 1b3bb1a0..8072d007 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -20,7 +20,7 @@ AUX bash-4.3-protos.patch 174 SHA256 729aded4f907f4bad466785eed850b2b25a145e9ed7 AUX bash-4.3-signal.h.patch 210 SHA256 3301f5849483135d93ec5e5f9e8256e094cf17762c5dab91167f253b1a23871e SHA512 9f8756740c35434c8150f97d91ef65109def9c80bc3f0c251f7561af49a504b240395ae8a8517ffcabce599c3203b5e23effbc6bd008cd1d9f80a4cdaf638284 WHIRLPOOL 329c3fc0fbf535bb7cdfe3ac60a418734c9aa03b8ce89fb065fbdd24c6a1aae33a4156e870fbe1272df9581a166c219d93c10c74db2c319985bc8e78b89778ec AUX bash_logout 205 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d WHIRLPOOL 16242c8796af44f550f2935b37c770c022754c63db75b57fbe49d1a313b8651235619ead571cd70ae37f890c694d1c6b2e4871ec51345743eff8649782d0523b AUX bashrc 3637 SHA256 cd1e64f5b48348e1960fe68fd7dc3716cd12a9ae3a9dd24cb75ccb17cd8300c4 SHA512 bac4c6ba06441e50f1303bbb9549aded2af72731fc0d1f935ec716104e0442e36f9afe28fe29c86f159d0cdfe9f1ba7dc2f42cee4265a1869e879853f531ea06 WHIRLPOOL 970741fa3438bc75d0fca1d9449b3afc51e087420de745b64073d6f1844dc73d6c0c2ad6b2575000fd3d0a7f5d6f9b9e834287ec8c4de79ebdea5b644ba82c0f -AUX bashrc-prefix.patch 1246 SHA256 2c45e5c0e3848b9da036affe25104c03e594d0ea4f298e8ca0b26912c94ea453 SHA512 c90d575d28dfae75f97b044bc44d8f9e2e5e252a593663ee0aa669a933f3b61aece44d2a61f251af5a02823df3af1591cd203f74acfcfa1819f8ae09bd10a236 WHIRLPOOL 4eb9bcfd3d96ceb24196eb927eb795fe474e698c0927db21402ac7a34d58d24606f2d016b351930435f9e4866a72ac7a3432612614d1c60bd2797701c343a2c9 +AUX bashrc-prefix.patch 1313 SHA256 f21fd0476c51848c724a43e98c998b1d0f8b459426ebb157525211a284f4b516 SHA512 151aacbe2e3c6bbf42b6a219938829cd5fd635584dddcf7d712dc50fd93bad46344333aa9b21f22ec1b0d1143e42e66cf6b87d823523a4bc29f36d7402d2c1e8 WHIRLPOOL 2faf4824f46ca588ebacb6f1c7eff5ab3621a0c391abeacc35183ba842d9dbc6f0a1b6e19ea2f473152784bd13a83a024a756d8c1d683ff9e3b33158ce77675b AUX bashrc-prefix.patch.old 1502 SHA256 004ae7a51b0fc73d79658a707af0889b9fadaf41e0181ae4e24e2e0e504ff0d0 SHA512 f09f7f587709fc8624141c2d4576a150787bd27fbc64c12126cdb1d4f346ef4d5ab5c2a6c3f16ed4ece385a9f9e0341066563ac6d027bb08d005dce2c523d2f7 WHIRLPOOL 1ed21b8bc78811423354cdcbefd7538d4e2060e89a88044b54f8aebd3c491c6119ea7039587853399136f02ee50946be329e95f19aff84c36e1c12399b3fd378 AUX bashrc.old 3754 SHA256 5427e3e082ec835e859d9469cf8fe9e2e4b11c1dfce877b9d6a681451c14c507 SHA512 cb30d5b3771d2aeed476102033d6d6348ec7e77e7d6ad6778417e29a662e00c130d338b781cfcf7a747d437757ca8629645d1dff92116bb0709152f9cc30829d WHIRLPOOL a28aaacf65d744b1f880f7e3fa9c270551af863fc979ffddd88d76309102f03b7a484b2589ab4f7db3a0d4ec40449d7d0e55dd915d9fc8376ed940ab9cceae15 AUX dot-bash_logout 127 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd WHIRLPOOL 3dc6bc364f8229d123873940743866dfc330e193ab6ec7c5162c61d0ecc319198a64f27176521bfb979c31eed9ed0b2ee2ffce31b050d4cb8e3aa8a5c12c38cf diff --git a/app-shells/bash/files/bashrc-prefix.patch b/app-shells/bash/files/bashrc-prefix.patch index dd5f2118..cea6e280 100644 --- a/app-shells/bash/files/bashrc-prefix.patch +++ b/app-shells/bash/files/bashrc-prefix.patch @@ -6,27 +6,29 @@ # # This file is sourced by all *interactive* bash shells on startup, # including some apparently interactive shells such as scp and rcp -@@ -64,7 +64,7 @@ - safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM - match_lhs="" - [[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)" --[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)" -+[[ -f @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(<@GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS)" - [[ -z ${match_lhs} ]] \ - && type -P dircolors >/dev/null \ - && match_lhs=$(dircolors --print-database) -@@ -75,8 +75,8 @@ - if type -P dircolors >/dev/null ; then - if [[ -f ~/.dir_colors ]] ; then - eval $(dircolors -b ~/.dir_colors) -- elif [[ -f /etc/DIR_COLORS ]] ; then -- eval $(dircolors -b /etc/DIR_COLORS) -+ elif [[ -f @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS ]] ; then -+ eval $(dircolors -b @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS) - fi - fi +@@ -51,18 +51,18 @@ -@@ -100,7 +100,7 @@ + # Set colorful PS1 only on colorful terminals. + # dircolors --print-database uses its own built-in database +-# instead of using /etc/DIR_COLORS. Try to use the external file ++# instead of using @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS. Try to use the external file + # first to take advantage of user additions. + # We run dircolors directly due to its changes in file syntax and + # terminal name patching. + use_color=false + if type -P dircolors >/dev/null ; then + # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 + LS_COLORS='' + if [[ -f ~/.dir_colors ]] ; then + eval "$(dircolors -b ~/.dir_colors)" +- elif [[ -f /etc/DIR_COLORS ]] ; then +- eval "$(dircolors -b /etc/DIR_COLORS)" ++ elif [[ -f @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS ]] ; then ++ eval "$(dircolors -b @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS)" + else + eval "$(dircolors -b)" + fi +@@ -105,7 +105,7 @@ fi fi |