SOURCES: bash-skel-.bash_profile, bash-skel-.bashrc - ~/.bashrc with /etc/b...

[gotar]

Author: gotar                        Date: Thu Dec 25 13:46:18 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- ~/.bashrc with /etc/bashrc shouldn't be even executed for non-interactive
  shells, moved test from bottom lines of .bashrc to .bash_profile; test
  left in /etc/bashrc as we can't fix local configurations in home dirs

---- Files affected:
SOURCES:
   bash-skel-.bash_profile (1.6 -> 1.7) , bash-skel-.bashrc (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/bash-skel-.bash_profile
diff -u SOURCES/bash-skel-.bash_profile:1.6 SOURCES/bash-skel-.bash_profile:1.7
--- SOURCES/bash-skel-.bash_profile:1.6	Wed Feb 14 15:30:34 2007
+++ SOURCES/bash-skel-.bash_profile	Thu Dec 25 14:46:12 2008
@@ -1,6 +1,8 @@
 # .bash_profile - file executed when logging in
 
-if [ -f ~/.bashrc ]; then
+# execute local (and so system wide) rc file only when interactive (not from scp etc.)
+# bash is too dumb to do in on it's own when started as login shell
+if [ $- = *i* && -f ~/.bashrc ]; then
 	. ~/.bashrc
 fi
 
@@ -12,6 +14,7 @@
 # setup LOCALE variables
 #export LANG=
 #export LC_ALL=
+#export LANGUAGE=
 
 # only You can access your files
 #umask 077

================================================================
Index: SOURCES/bash-skel-.bashrc
diff -u SOURCES/bash-skel-.bashrc:1.3 SOURCES/bash-skel-.bashrc:1.4
--- SOURCES/bash-skel-.bashrc:1.3	Wed Nov 14 01:39:00 2007
+++ SOURCES/bash-skel-.bashrc	Thu Dec 25 14:46:13 2008
@@ -1,12 +1,7 @@
-# .bashrc - file executed when executing bash
+# .bashrc - startup file for bash as interactive shell
 
 if [ -f /etc/bashrc ]; then
 	. /etc/bashrc
 fi
 
-# return if the shell is not interactive (called from scp, etc)
-if [[ $- != *i* ]]; then
-	return
-fi
-
-# Put your local aliases here
+# Put your local functions and aliases here
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/bash-skel-.bash_profile?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/bash-skel-.bashrc?r1=1.3&r2=1.4&f=u