diff options
Diffstat (limited to 'app-shells/bash/files')
| -rw-r--r-- | app-shells/bash/files/autoconf-mktime-2.53.patch | 199 | ||||
| -rw-r--r-- | app-shells/bash/files/autoconf-mktime-2.59.patch | 197 | ||||
| -rw-r--r-- | app-shells/bash/files/bash-4.0-configs-prefix.patch | 15 | ||||
| -rw-r--r-- | app-shells/bash/files/bash-4.3-append-process-segfault.patch | 18 | ||||
| -rw-r--r-- | app-shells/bash/files/bash-4.3-arrayfunc.patch | 15 | ||||
| -rw-r--r-- | app-shells/bash/files/bash-4.3-compat-lvl.patch | 13 | ||||
| -rw-r--r-- | app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch | 13 | ||||
| -rw-r--r-- | app-shells/bash/files/bash-4.3-protos.patch | 10 | ||||
| -rw-r--r-- | app-shells/bash/files/bash-4.x-deferred-heredocs.patch | 47 | ||||
| -rw-r--r-- | app-shells/bash/files/bash_logout | 9 | ||||
| -rw-r--r-- | app-shells/bash/files/bashrc | 126 | ||||
| -rw-r--r-- | app-shells/bash/files/dot-bash_logout | 6 | ||||
| -rw-r--r-- | app-shells/bash/files/dot-bash_profile | 7 | ||||
| -rw-r--r-- | app-shells/bash/files/dot-bashrc | 18 |
14 files changed, 0 insertions, 693 deletions
diff --git a/app-shells/bash/files/autoconf-mktime-2.53.patch b/app-shells/bash/files/autoconf-mktime-2.53.patch deleted file mode 100644 index 7632b63..0000000 --- a/app-shells/bash/files/autoconf-mktime-2.53.patch +++ /dev/null @@ -1,199 +0,0 @@ -https://bugs.gentoo.org/220040 - ---- a/configure -+++ b/configure -@@ -12393,22 +12393,25 @@ else - #line $LINENO "configure" - #include "confdefs.h" - /* Test program from Paul Eggert and Tony Leneis. */ --#if TIME_WITH_SYS_TIME -+#ifdef TIME_WITH_SYS_TIME - # include <sys/time.h> - # include <time.h> - #else --# if HAVE_SYS_TIME_H -+# ifdef HAVE_SYS_TIME_H - # include <sys/time.h> - # else - # include <time.h> - # endif - #endif - --#if HAVE_UNISTD_H -+#include <limits.h> -+#include <stdlib.h> -+ -+#ifdef HAVE_UNISTD_H - # include <unistd.h> - #endif - --#if !HAVE_ALARM -+#ifndef HAVE_ALARM - # define alarm(X) /* empty */ - #endif - -@@ -12416,6 +12419,7 @@ else - #undef putenv - - static time_t time_t_max; -+static time_t time_t_min; - - /* Values we'll use to set the TZ environment variable. */ - static const char *const tz_strings[] = { -@@ -12424,9 +12428,9 @@ static const char *const tz_strings[] = { - }; - #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - --/* Fail if mktime fails to convert a date in the spring-forward gap. -+/* Return 0 if mktime fails to convert a date in the spring-forward gap. - Based on a problem report from Andreas Jaeger. */ --static void -+static int - spring_forward_gap () - { - /* glibc (up to about 1998-10-07) failed this test. */ -@@ -12445,23 +12449,27 @@ spring_forward_gap () - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; -- if (mktime (&tm) == (time_t)-1) -- exit (1); -+ return mktime (&tm) != (time_t) -1; - } - --static void --mktime_test (now) -+static int -+mktime_test1 (now) - time_t now; - { - struct tm *lt; -- if ((lt = localtime (&now)) && mktime (lt) != now) -- exit (1); -- now = time_t_max - now; -- if ((lt = localtime (&now)) && mktime (lt) != now) -- exit (1); -+ return ! (lt = localtime (&now)) || mktime (lt) == now; - } - --static void -+static int -+mktime_test (now) -+ time_t now; -+{ -+ return (mktime_test1 (now) -+ && mktime_test1 ((time_t) (time_t_max - now)) -+ && mktime_test1 ((time_t) (time_t_min + now))); -+} -+ -+static int - irix_6_4_bug () - { - /* Based on code from Ariel Faigon. */ -@@ -12474,11 +12482,10 @@ irix_6_4_bug () - tm.tm_sec = 0; - tm.tm_isdst = -1; - mktime (&tm); -- if (tm.tm_mon != 2 || tm.tm_mday != 31) -- exit (1); -+ return tm.tm_mon == 2 && tm.tm_mday == 31; - } - --static void -+static int - bigtime_test (j) - int j; - { -@@ -12500,8 +12507,39 @@ bigtime_test (j) - && lt->tm_wday == tm.tm_wday - && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) - == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) -- exit (1); -+ return 0; - } -+ return 1; -+} -+ -+static int -+year_2050_test () -+{ -+ /* The correct answer for 2050-02-01 00:00:00 in Pacific time, -+ ignoring leap seconds. */ -+ unsigned long int answer = 2527315200UL; -+ -+ struct tm tm; -+ time_t t; -+ tm.tm_year = 2050 - 1900; -+ tm.tm_mon = 2 - 1; -+ tm.tm_mday = 1; -+ tm.tm_hour = tm.tm_min = tm.tm_sec = 0; -+ tm.tm_isdst = -1; -+ -+ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" -+ instead of "TZ=America/Vancouver" in order to detect the bug even -+ on systems that don't support the Olson extension, or don't have the -+ full zoneinfo tables installed. */ -+ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); -+ -+ t = mktime (&tm); -+ -+ /* Check that the result is either a failure, or close enough -+ to the correct answer that we can assume the discrepancy is -+ due to leap seconds. */ -+ return (t == (time_t) -1 -+ || (0 < t && answer - 120 <= t && t <= answer + 120)); - } - - int -@@ -12515,9 +12553,15 @@ main () - isn't worth using anyway. */ - alarm (60); - -- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) -- continue; -- time_t_max--; -+ for (;;) -+ { -+ t = (time_t_max << 1) + 1; -+ if (t <= time_t_max) -+ break; -+ time_t_max = t; -+ } -+ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; -+ - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { -@@ -12525,17 +12569,22 @@ main () - putenv (tz_strings[i]); - - for (t = 0; t <= time_t_max - delta; t += delta) -- mktime_test (t); -- mktime_test ((time_t) 60 * 60); -- mktime_test ((time_t) 60 * 60 * 24); -- -- for (j = 1; 0 < j; j *= 2) -- bigtime_test (j); -- bigtime_test (j - 1); -+ if (! mktime_test (t)) -+ return 1; -+ if (! (mktime_test ((time_t) 1) -+ && mktime_test ((time_t) (60 * 60)) -+ && mktime_test ((time_t) (60 * 60 * 24)))) -+ return 1; -+ -+ for (j = 1; ; j <<= 1) -+ if (! bigtime_test (j)) -+ return 1; -+ else if (INT_MAX / 2 < j) -+ break; -+ if (! bigtime_test (INT_MAX)) -+ return 1; - } -- irix_6_4_bug (); -- spring_forward_gap (); -- exit (0); -+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); - } - _ACEOF - rm -f conftest$ac_exeext diff --git a/app-shells/bash/files/autoconf-mktime-2.59.patch b/app-shells/bash/files/autoconf-mktime-2.59.patch deleted file mode 100644 index 3ac3ad1..0000000 --- a/app-shells/bash/files/autoconf-mktime-2.59.patch +++ /dev/null @@ -1,197 +0,0 @@ -http://bugs.gentoo.org/220040 ---- configure -+++ configure -@@ -5299,26 +6059,25 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - /* Test program from Paul Eggert and Tony Leneis. */ --#if TIME_WITH_SYS_TIME -+#ifdef TIME_WITH_SYS_TIME - # include <sys/time.h> - # include <time.h> - #else --# if HAVE_SYS_TIME_H -+# ifdef HAVE_SYS_TIME_H - # include <sys/time.h> - # else - # include <time.h> - # endif - #endif - --#if HAVE_STDLIB_H --# include <stdlib.h> --#endif -+#include <limits.h> -+#include <stdlib.h> - --#if HAVE_UNISTD_H -+#ifdef HAVE_UNISTD_H - # include <unistd.h> - #endif - --#if !HAVE_ALARM -+#ifndef HAVE_ALARM - # define alarm(X) /* empty */ - #endif - -@@ -5335,9 +6094,9 @@ - }; - #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - --/* Fail if mktime fails to convert a date in the spring-forward gap. -+/* Return 0 if mktime fails to convert a date in the spring-forward gap. - Based on a problem report from Andreas Jaeger. */ --static void -+static int - spring_forward_gap () - { - /* glibc (up to about 1998-10-07) failed this test. */ -@@ -5356,29 +6115,27 @@ - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; -- if (mktime (&tm) == (time_t)-1) -- exit (1); -+ return mktime (&tm) != (time_t) -1; - } - --static void -+static int - mktime_test1 (now) - time_t now; - { - struct tm *lt; -- if ((lt = localtime (&now)) && mktime (lt) != now) -- exit (1); -+ return ! (lt = localtime (&now)) || mktime (lt) == now; - } - --static void -+static int - mktime_test (now) - time_t now; - { -- mktime_test1 (now); -- mktime_test1 ((time_t) (time_t_max - now)); -- mktime_test1 ((time_t) (time_t_min + now)); -+ return (mktime_test1 (now) -+ && mktime_test1 ((time_t) (time_t_max - now)) -+ && mktime_test1 ((time_t) (time_t_min + now))); - } - --static void -+static int - irix_6_4_bug () - { - /* Based on code from Ariel Faigon. */ -@@ -5391,11 +6148,10 @@ - tm.tm_sec = 0; - tm.tm_isdst = -1; - mktime (&tm); -- if (tm.tm_mon != 2 || tm.tm_mday != 31) -- exit (1); -+ return tm.tm_mon == 2 && tm.tm_mday == 31; - } - --static void -+static int - bigtime_test (j) - int j; - { -@@ -5417,8 +6173,39 @@ - && lt->tm_wday == tm.tm_wday - && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) - == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) -- exit (1); -+ return 0; - } -+ return 1; -+} -+ -+static int -+year_2050_test () -+{ -+ /* The correct answer for 2050-02-01 00:00:00 in Pacific time, -+ ignoring leap seconds. */ -+ unsigned long int answer = 2527315200UL; -+ -+ struct tm tm; -+ time_t t; -+ tm.tm_year = 2050 - 1900; -+ tm.tm_mon = 2 - 1; -+ tm.tm_mday = 1; -+ tm.tm_hour = tm.tm_min = tm.tm_sec = 0; -+ tm.tm_isdst = -1; -+ -+ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" -+ instead of "TZ=America/Vancouver" in order to detect the bug even -+ on systems that don't support the Olson extension, or don't have the -+ full zoneinfo tables installed. */ -+ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); -+ -+ t = mktime (&tm); -+ -+ /* Check that the result is either a failure, or close enough -+ to the correct answer that we can assume the discrepancy is -+ due to leap seconds. */ -+ return (t == (time_t) -1 -+ || (0 < t && answer - 120 <= t && t <= answer + 120)); - } - - int -@@ -5432,12 +6219,15 @@ - isn't worth using anyway. */ - alarm (60); - -- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) -- continue; -- time_t_max--; -- if ((time_t) -1 < 0) -- for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2) -- continue; -+ for (;;) -+ { -+ t = (time_t_max << 1) + 1; -+ if (t <= time_t_max) -+ break; -+ time_t_max = t; -+ } -+ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; -+ - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { -@@ -5445,18 +6235,22 @@ - putenv (tz_strings[i]); - - for (t = 0; t <= time_t_max - delta; t += delta) -- mktime_test (t); -- mktime_test ((time_t) 1); -- mktime_test ((time_t) (60 * 60)); -- mktime_test ((time_t) (60 * 60 * 24)); -- -- for (j = 1; 0 < j; j *= 2) -- bigtime_test (j); -- bigtime_test (j - 1); -+ if (! mktime_test (t)) -+ return 1; -+ if (! (mktime_test ((time_t) 1) -+ && mktime_test ((time_t) (60 * 60)) -+ && mktime_test ((time_t) (60 * 60 * 24)))) -+ return 1; -+ -+ for (j = 1; ; j <<= 1) -+ if (! bigtime_test (j)) -+ return 1; -+ else if (INT_MAX / 2 < j) -+ break; -+ if (! bigtime_test (INT_MAX)) -+ return 1; - } -- irix_6_4_bug (); -- spring_forward_gap (); -- exit (0); -+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); - } - _ACEOF - rm -f conftest$ac_exeext diff --git a/app-shells/bash/files/bash-4.0-configs-prefix.patch b/app-shells/bash/files/bash-4.0-configs-prefix.patch deleted file mode 100644 index c6ada7c..0000000 --- a/app-shells/bash/files/bash-4.0-configs-prefix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- bash-4.0/pathnames.h.in -+++ bash-4.0/pathnames.h.in -@@ -22,10 +22,10 @@ - #define _PATHNAMES_H_ - - /* The default file for hostname completion. */ --#define DEFAULT_HOSTS_FILE "/etc/hosts" -+#define DEFAULT_HOSTS_FILE "@GENTOO_PORTAGE_EPREFIX@/etc/hosts" - - /* The default login shell startup file. */ --#define SYS_PROFILE "/etc/profile" -+#define SYS_PROFILE "@GENTOO_PORTAGE_EPREFIX@/etc/profile" - - /* The default location of the bash debugger initialization/startup file. */ - #define DEBUGGER_START_FILE "@DEBUGGER_START_FILE@" diff --git a/app-shells/bash/files/bash-4.3-append-process-segfault.patch b/app-shells/bash/files/bash-4.3-append-process-segfault.patch deleted file mode 100644 index 6c9b2e8..0000000 --- a/app-shells/bash/files/bash-4.3-append-process-segfault.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://lists.gnu.org/archive/html/bug-bash/2014-08/msg00048.html - -*** ../bash-4.3-patched/execute_cmd.c 2014-07-30 10:26:52.000000000 -0400 ---- execute_cmd.c 2014-08-11 16:55:57.000000000 -0400 -*************** -*** 2406,2410 **** - { - #if defined (JOB_CONTROL) -! append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid); - #endif - lstdin = wait_for (lastpid); ---- 2433,2438 ---- - { - #if defined (JOB_CONTROL) -! if (INVALID_JOB (lastpipe_jid) == 0) -! append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid); - #endif - lstdin = wait_for (lastpid); diff --git a/app-shells/bash/files/bash-4.3-arrayfunc.patch b/app-shells/bash/files/bash-4.3-arrayfunc.patch deleted file mode 100644 index f44d184..0000000 --- a/app-shells/bash/files/bash-4.3-arrayfunc.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00178.html - -diff --git a/arrayfunc.c b/arrayfunc.c -index 804e6da..0f900aa 100644 ---- a/arrayfunc.c -+++ b/arrayfunc.c -@@ -498,7 +498,7 @@ assign_compound_array_list (var, nlist, flags) - - for (list = nlist; list; list = list->next) - { -- iflags = flags; -+ iflags = (flags & ~ASS_APPEND); - w = list->word->word; - - /* We have a word of the form [ind]=value */ diff --git a/app-shells/bash/files/bash-4.3-compat-lvl.patch b/app-shells/bash/files/bash-4.3-compat-lvl.patch deleted file mode 100644 index 5734687..0000000 --- a/app-shells/bash/files/bash-4.3-compat-lvl.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://lists.gnu.org/archive/html/bug-bash/2014-06/msg00046.html - ---- a/builtins/shopt.def -+++ b/builtins/shopt.def -@@ -160,7 +160,7 @@ static struct { - { "compat32", &shopt_compat32, set_compatibility_level }, - { "compat40", &shopt_compat40, set_compatibility_level }, - { "compat41", &shopt_compat41, set_compatibility_level }, -- { "compat42", &shopt_compat41, set_compatibility_level }, -+ { "compat42", &shopt_compat42, set_compatibility_level }, - #if defined (READLINE) - { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL}, - { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, diff --git a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch deleted file mode 100644 index 20bf340..0000000 --- a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00097.html - ---- bash-4.3/builtins/mapfile.def -+++ bash-4.3/builtins/mapfile.def -@@ -339,7 +339,7 @@ - else - array_name = list->word->word; - -- if (legal_identifier (array_name) == 0 && valid_array_reference (array_name) == 0) -+ if (legal_identifier (array_name) == 0) - { - sh_invalidid (array_name); - return (EXECUTION_FAILURE); diff --git a/app-shells/bash/files/bash-4.3-protos.patch b/app-shells/bash/files/bash-4.3-protos.patch deleted file mode 100644 index 7af84ff..0000000 --- a/app-shells/bash/files/bash-4.3-protos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/redir.c -+++ b/redir.c -@@ -31,6 +31,7 @@ - #endif - #include "filecntl.h" - #include "posixstat.h" -+#include "trap.h" - - #if defined (HAVE_UNISTD_H) - # include <unistd.h> diff --git a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch b/app-shells/bash/files/bash-4.x-deferred-heredocs.patch deleted file mode 100644 index 698d277..0000000 --- a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch +++ /dev/null @@ -1,47 +0,0 @@ -http://bugs.gentoo.org/310197 -http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html - -fix heredocs handling in `set` output - -*** ../bash-4.1-patched/print_cmd.c 2009-09-16 15:32:26.000000000 -0400 ---- print_cmd.c 2010-03-22 21:15:30.000000000 -0400 -*************** -*** 114,117 **** ---- 114,123 ---- - #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr) - -+ #define PRINT_DEFERRED_HEREDOCS(x) \ -+ do { \ -+ if (deferred_heredocs) \ -+ print_deferred_heredocs (x); \ -+ } while (0) -+ - /* Non-zero means the stuff being printed is inside of a function def. */ - static int inside_function_def; -*************** -*** 561,571 **** - { - print_for_command_head (for_command); -- - cprintf (";"); - newline ("do\n"); - indentation += indentation_amount; - make_command_string_internal (for_command->action); - semicolon (); - indentation -= indentation_amount; - newline ("done"); - } ---- 566,578 ---- - { - print_for_command_head (for_command); - cprintf (";"); - newline ("do\n"); -+ - indentation += indentation_amount; - make_command_string_internal (for_command->action); -+ PRINT_DEFERRED_HEREDOCS (""); - semicolon (); - indentation -= indentation_amount; -+ - newline ("done"); - } diff --git a/app-shells/bash/files/bash_logout b/app-shells/bash/files/bash_logout deleted file mode 100644 index 50a7933..0000000 --- a/app-shells/bash/files/bash_logout +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/bash/bash_logout - -# This file is sourced when a login shell terminates. - -# You may wish to clear everyone's screen when they logout. -#clear - -# Or maybe you want to leave a thoughtful note. -#fortune diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc deleted file mode 100644 index 2bd746d..0000000 --- a/app-shells/bash/files/bashrc +++ /dev/null @@ -1,126 +0,0 @@ -# @GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc -# -# This file is sourced by all *interactive* bash shells on startup, -# including some apparently interactive shells such as scp and rcp -# that can't tolerate any output. So make sure this doesn't display -# anything or bad things will happen ! - - -# Test for an interactive shell. There is no need to set anything -# past this point for scp and rcp, and it's important to refrain from -# outputting anything in those cases. -if [[ $- != *i* ]] ; then - # Shell is non-interactive. Be done now! - return -fi - -# Bash won't get SIGWINCH if another process is in the foreground. -# Enable checkwinsize so that bash will check the terminal size when -# it regains control. #65623 -# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11) -shopt -s checkwinsize - -# Disable completion when the input buffer is empty. i.e. Hitting tab -# and waiting a long time for bash to expand all of $PATH. -shopt -s no_empty_cmd_completion - -# Enable history appending instead of overwriting when exiting. #139609 -shopt -s histappend - -# Save each command to the history file as it's executed. #517342 -# This does mean sessions get interleaved when reading later on, but this -# way the history is always up to date. History is not synced across live -# sessions though; that is what `history -n` does. -# Disabled by default due to concerns related to system recovery when $HOME -# is under duress, or lives somewhere flaky (like NFS). Constantly syncing -# the history will halt the shell prompt until it's finished. -#PROMPT_COMMAND='history -a' - -# Change the window title of X terminals -case ${TERM} in - [aEkx]term*|rxvt*|gnome*|konsole*|interix) - PS1='\[\033]0;\u@\h:\w\007\]' - ;; - screen*) - PS1='\[\033k\u@\h:\w\033\\\]' - ;; - *) - unset PS1 - ;; -esac - -# 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 -# first to take advantage of user additions. -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 - # If you have a custom file, chances are high that it's not the default. - used_default_dircolors="no" - eval "$(dircolors -b ~/.dir_colors)" - elif [[ -f @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS ]] ; then - # People might have customized the system database. - used_default_dircolors="maybe" - eval "$(dircolors -b @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS)" - else - used_default_dircolors="yes" - eval "$(dircolors -b)" - fi - if [[ -n ${LS_COLORS:+set} ]] ; then - use_color=true - - # The majority of systems out there do not customize these files, so we - # want to avoid always exporting the large $LS_COLORS variable. This - # keeps the active env smaller, and it means we don't have to deal with - # running new/old (incompatible) versions of `ls` compared to when we - # last sourced this file. - case ${used_default_dircolors} in - no) ;; - yes) unset LS_COLORS ;; - *) - ls_colors=$(eval "$(dircolors -b)"; echo "${LS_COLORS}") - if [[ ${ls_colors} == "${LS_COLORS}" ]] ; then - unset LS_COLORS - fi - ;; - esac - fi - unset used_default_dircolors -else - # Some systems (e.g. BSD & embedded) don't typically come with - # dircolors so we need to hardcode some terminals in here. - case ${TERM} in - [aEkx]term*|rxvt*|gnome*|konsole*|screen|cons25|*color) use_color=true;; - esac -fi - -if ${use_color} ; then - if [[ ${EUID} == 0 ]] ; then - PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] ' - else - PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' - fi - - #BSD#@export CLICOLOR=1 - #GNU#@alias ls='ls --color=auto' - alias grep='grep --colour=auto' - 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 -fi - -for sh in @GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc.d/* ; do - [[ -r ${sh} ]] && source "${sh}" -done - -# Try to keep environment pollution down, EPA loves us. -unset use_color sh diff --git a/app-shells/bash/files/dot-bash_logout b/app-shells/bash/files/dot-bash_logout deleted file mode 100644 index 44b6f79..0000000 --- a/app-shells/bash/files/dot-bash_logout +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/skel/.bash_logout - -# This file is sourced when a login shell terminates. - -# Clear the screen for security's sake. -clear diff --git a/app-shells/bash/files/dot-bash_profile b/app-shells/bash/files/dot-bash_profile deleted file mode 100644 index 1de05a4..0000000 --- a/app-shells/bash/files/dot-bash_profile +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/skel/.bash_profile - -# This file is sourced by bash for login shells. The following line -# runs your .bashrc and is recommended by the bash info pages. -if [[ -f ~/.bashrc ]] ; then - . ~/.bashrc -fi diff --git a/app-shells/bash/files/dot-bashrc b/app-shells/bash/files/dot-bashrc deleted file mode 100644 index 34dbd8c..0000000 --- a/app-shells/bash/files/dot-bashrc +++ /dev/null @@ -1,18 +0,0 @@ -# /etc/skel/.bashrc -# -# This file is sourced by all *interactive* bash shells on startup, -# including some apparently interactive shells such as scp and rcp -# that can't tolerate any output. So make sure this doesn't display -# anything or bad things will happen ! - - -# Test for an interactive shell. There is no need to set anything -# past this point for scp and rcp, and it's important to refrain from -# outputting anything in those cases. -if [[ $- != *i* ]] ; then - # Shell is non-interactive. Be done now! - return -fi - - -# Put your fun stuff here. |