Hello community, here is the log from the commit of package aaa_base checked in at Tue Apr 25 17:21:56 CEST 2006. -------- --- aaa_base/aaa_base.changes 2006-04-23 17:00:30.000000000 +0200 +++ STABLE/aaa_base/aaa_base.changes 2006-04-25 14:26:43.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 25 14:25:24 CEST 2006 - werner@suse.de + +- Use the which shell function only for the bash (bug #168662) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.zt9bKZ/_old 2006-04-25 17:19:37.000000000 +0200 +++ /var/tmp/diff_new_pack.zt9bKZ/_new 2006-04-25 17:19:37.000000000 +0200 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv Autoreqprov: on Version: 10.1 -Release: 27 +Release: 29 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -153,6 +153,8 @@ %defattr(-,root,root) %changelog -n aaa_base +* Tue Apr 25 2006 - werner@suse.de +- Use the which shell function only for the bash (bug #168662) * Sun Apr 23 2006 - sndirsch@suse.de - fixed xdm script (Bug #168633) * Thu Apr 20 2006 - ro@suse.de ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/bash.bashrc new/aaa_base/etc/bash.bashrc --- old/aaa_base/etc/bash.bashrc 2006-03-22 13:52:35.000000000 +0100 +++ new/aaa_base/etc/bash.bashrc 2006-04-25 14:23:43.000000000 +0200 @@ -208,16 +208,22 @@ fi alias rd=rmdir alias md='mkdir -p' - _which () { - local file=$(type -p ${1+"$@"} 2>/dev/null) - if test -n "$file" -a -x "$file"; then - echo "$file" - return 0 - fi - hash -r - type -P ${1+"$@"} - } - alias which=_which + if test "$is" = "bash" ; then + # + # Other shells use the which command in path (e.g. ash) or + # their own builtin for the which command (e.g. ksh and zsh). + # + _which () { + local file=$(type -p ${1+"$@"} 2>/dev/null) + if test -n "$file" -a -x "$file"; then + echo "$file" + return 0 + fi + hash -r + type -P ${1+"$@"} + } + alias which=_which + fi alias rehash='hash -r' alias you='su - -c "/sbin/yast2 online_update"' if test "$is" != "ksh" ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de