Author: mvidner Date: Tue Feb 3 09:47:34 2009 New Revision: 55199 URL: http://svn.opensuse.org/viewcvs/yast?rev=55199&view=rev Log: Fixed prefix detection if called "bash -x yast2" (bnc#458385 c12). (manual merge from trunk) Modified: branches/SuSE-Code-11-Branch/yast2/VERSION branches/SuSE-Code-11-Branch/yast2/package/yast2.changes branches/SuSE-Code-11-Branch/yast2/scripts/yast2 Modified: branches/SuSE-Code-11-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/VERSION?rev=55199&r1=55198&r2=55199&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-Branch/yast2/VERSION Tue Feb 3 09:47:34 2009 @@ -1 +1 @@ -2.17.64 +2.17.65 Modified: branches/SuSE-Code-11-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/package/yast2.changes?rev=55199&r1=55198&r2=55199&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Tue Feb 3 09:47:34 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 3 09:27:34 CET 2009 - mvidner@suse.cz + +- Fixed prefix detection if called "bash -x yast2" (bnc#458385 c12). +- 2.17.65 + +------------------------------------------------------------------- Fri Jan 30 11:14:42 CET 2009 - jsrain@suse.cz - fixed bash completion (bnc #470544) Modified: branches/SuSE-Code-11-Branch/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/scripts/yast2?rev=55199&r1=55198&r2=55199&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/scripts/yast2 (original) +++ branches/SuSE-Code-11-Branch/yast2/scripts/yast2 Tue Feb 3 09:47:34 2009 @@ -16,8 +16,11 @@ export PATH=/sbin:/usr/sbin:$PATH # allow for a different prefix -mydir=${0%/[YyZz]a[Ss][Tt]*} -if [[ -z "$mydir" || "$mydir" =~ ^/sbin/* ]]; then +# strip the basename off $0, which can be: (bnc#382216, bnc#458385) +# /sbin/yast2, /sbin/yast, yast2 (sh -x yast2 ...), /sbin//yast2 (PATH=/sbin/:...) +shopt -s extglob +mydir=${0%%*(/)[YyZz]a[Ss][Tt]?(2)} +if [[ -z "$mydir" || "$mydir" = /sbin ]]; then YAST_PREFIX=/usr else YAST_PREFIX=${mydir%/sbin} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org