X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/blobdiff_plain/5d2b7dabde9c32e96d3a770e3459321f90ff3062..852cd5fbddafbfed93df4cda8ba366b14922e95d:/bash_profile diff --git a/bash_profile b/bash_profile index e0bd570..8c7dca6 100644 --- a/bash_profile +++ b/bash_profile @@ -29,9 +29,9 @@ __mdw_addto () { [ -d $i ] || continue case "X$val" in X) - val=$i - continue - ;; + val=$i + continue + ;; X$i) continue ;; @@ -59,7 +59,7 @@ __mdw_addto () { __mdw_conf () { local var=$1 val=`sed -n " - /^[ ]*$var[ ]*=[ ]*\(\|.*[^ ]\)[ ]*$/ { + /^[ ]*$var[ ]*=[ ]*\(\|.*[^ ]\)[ ]*$/ { s//\1/; p; q } " ${MDWCONF-$HOME/.mdw.conf}` @@ -164,7 +164,7 @@ eval `start-ssh-agent -b` if [ -z "$__mdw_bashrc" ] && [ "$__mdw_force_secure_session" = "yes" ] || ( tty="`tty`" devtty="(/dev/)?${tty#/dev/}" { { { [ -e /etc/securetty ] && sectty=/etc/securetty; } || - { [ -e /etc/securettys ] && sectty=/etc/securettys; }; } && + { [ -e /etc/securettys ] && sectty=/etc/securettys; }; } && egrep "$devtty" $sectty >/dev/null; } || { [ -e /etc/default/login ] && egrep "^CONSOLE=$devtty" /etc/default/login >/dev/null; } ||