Author: branden Date: 2004-04-28 11:16:44 -0500 (Wed, 28 Apr 2004) New Revision: 1329
Modified: trunk/debian/changelog trunk/debian/local/Xsession.d/20xfree86-common_process-args trunk/debian/local/Xsession.d/90xfree86-common_ssh-agent Log: Fix shell scriptlets in Xsession.d to use shell's && and || operators instead of test(1)'s -a and -o operators, since the former is POSIX-compliant and the latter is not. (cosmetic) Add comments. Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2004-04-28 16:12:46 UTC (rev 1328) +++ trunk/debian/changelog 2004-04-28 16:16:44 UTC (rev 1329) @@ -4,8 +4,12 @@ xrdb command before attempting to execute it, and warn if it is not found (thanks, Ryan Murray). (Closes: #242485) - -- Branden Robinson <[EMAIL PROTECTED]> Wed, 28 Apr 2004 11:09:16 -0500 + * Fix shell scriptlets in Xsession.d to use shell's && and || operators + instead of test(1)'s -a and -o operators, since the former is + POSIX-compliant and the latter is not. + -- Branden Robinson <[EMAIL PROTECTED]> Wed, 28 Apr 2004 11:14:57 -0500 + xfree86 (4.3.0.dfsg.1-1) unstable; urgency=low Changes by Branden Robinson and Fabio Massimo di Nitto: Modified: trunk/debian/local/Xsession.d/20xfree86-common_process-args =================================================================== --- trunk/debian/local/Xsession.d/20xfree86-common_process-args 2004-04-28 16:12:46 UTC (rev 1328) +++ trunk/debian/local/Xsession.d/20xfree86-common_process-args 2004-04-28 16:16:44 UTC (rev 1329) @@ -2,12 +2,16 @@ # This file is sourced by Xsession(5), not executed. +# Determine how many arguments were provided. case $# in 0) + # No arguments given; use default behavior. ;; 1) + # One argument given; see what it was. case "$1" in failsafe) + # Failsafe session was requested. if grep -qs ^allow-failsafe "$OPTIONFILE"; then if [ -e /usr/bin/x-terminal-emulator ]; then if [ -x /usr/bin/x-terminal-emulator ]; then @@ -25,10 +29,12 @@ fi ;; default) + # Default behavior was requested. ;; *) + # Specific program was requested. STARTUP_FULL_PATH=$(which $1) - if [ -n "$STARTUP_FULL_PATH" -a -e "$STARTUP_FULL_PATH" ]; then + if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then if [ -x "$STARTUP_FULL_PATH" ]; then STARTUP="$1" else @@ -43,6 +49,7 @@ esac ;; *) + # More than one argument given; we don't know what to do. message "unsupported number of arguments ($#); falling back to default" \ "session." ;; Modified: trunk/debian/local/Xsession.d/90xfree86-common_ssh-agent =================================================================== --- trunk/debian/local/Xsession.d/90xfree86-common_ssh-agent 2004-04-28 16:12:46 UTC (rev 1328) +++ trunk/debian/local/Xsession.d/90xfree86-common_ssh-agent 2004-04-28 16:16:44 UTC (rev 1329) @@ -7,7 +7,8 @@ SSHAGENTARGS= if grep -qs ^use-ssh-agent "$OPTIONFILE"; then - if [ -x "$SSHAGENT" -a -z "$SSH_AUTH_SOCK" -a -z "$SSH2_AUTH_SOCK" ]; then + if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \ + && [ -z "$SSH2_AUTH_SOCK" ]; then STARTSSH=yes if [ -f /usr/bin/ssh-add1 ] && cmp -s $SSHAGENT /usr/bin/ssh-agent2; then # use ssh-agent2's ssh-agent1 compatibility mode