X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=sys%2Fprofile;h=191cf2964b694d49dcd345e44b975b7ffe758666;hb=2f959f4d776bed41552958642aa93fafef109655;hp=8afa7ca1036575b2f609ab3c7853ff88bd1d4fd2;hpb=a587ede301fe5589de34f2511056f089feaacf62;p=ConfigScripts.git diff --git a/sys/profile b/sys/profile index 8afa7ca..191cf29 100644 --- a/sys/profile +++ b/sys/profile @@ -1,7 +1,7 @@ # # /etc/profile: system-wide profile for the Bourne shell (sh(1)) and # Bourne compatible shells (bash(1), ksh(1), ash(1), ...). -# Written 2003-2012 by Alexander Barton (alex@barton.de) +# Written 2003-2014 by Alexander Barton (alex@barton.de) # [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/profile ..." @@ -9,20 +9,32 @@ PROFILEREAD="true" export PROFILEREAD -# Make sure UID is set -[ -n "$UID" ] || UID=`id -u` -export UID - -# Indicates LC_CTYPE an UTF-8 terminal? -[ -n "$LC_CTYPE" ] \ - && LC_encoding="${LC_CTYPE#*.}" || LC_encoding="ISO8859-1" +# Setup locale and encoding +if [ -e ~/.ConfigScripts.debug ]; then + echo " - TERM=\"$TERM\"" + echo " - LANG=\"$LANG\"" + echo " - LC_CTYPE=\"$LC_CTYPE\"" +fi +# Does LC_CTYPE or LANG indicate an UTF-8 terminal? +LC_encoding="" +if [ -n "$LC_CTYPE" ]; then + LC_encoding="${LC_CTYPE#*.}" +elif [ -n "$LANG" ]; then + LC_encoding="${LANG#*.}" +fi +if [ -z "$LC_encoding" ]; then + case "$TERM" in + "xterm-"*) + LC_encoding="UTF-8"; ;; + *) + LC_encoding="ISO8859-1" + esac +fi +[ -e ~/.ConfigScripts.debug ] && echo " - LC_encoding=\"$LC_encoding\" (temp)" # Set locale if it is not set or doesn't contain a dot: [ "$LANG" = "${LANG#*.}" -a "$LANG" != "C" ] \ && export LANG="${LANG:-de_DE}.${LC_encoding}" -# All system messages should still be in "native" ("C") language for -# non-X11 sessions: -[ -z "$GDMSESSION" -a -z "$XDG_SESSION_COOKIE" ] \ - && export LC_MESSAGES="C" +[ -e ~/.ConfigScripts.debug ] && echo " - LANG=\"$LANG\" (new)" # Clean up ... unset LC_CTYPE LC_encoding 2>/dev/null @@ -35,30 +47,39 @@ if [ -x /usr/libexec/path_helper ]; then || PATH="/usr/local/bin:$PATH" else PATH="/usr/local/bin:/usr/bin:/bin" - [ "$UID" -eq 0 ] && PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH" + [ "$LOGNAME" = "root" ] && PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH" export PATH fi # prepend optional directories to PATH ... path="" for d in /Developer/usr/bin /usr/pkg/bin /usr/ucb /usr/lib/ccache /opt/*/bin; do - [ -d "$d" -o -h "$d" ] && path="$path$d:" + if [ -d "$d" -o -h "$d" ]; then + [ -e "$d/.not_in_path" ] || path="$path$d:" + fi done [ -n "$path" ] && PATH="$path$PATH" -if [ "$UID" -eq 0 ]; then +if [ "$LOGNAME" = "root" ]; then path="" for d in /usr/pkg/sbin /opt/*/sbin; do - [ -d "$d" -o -h "$d" ] && path="$path$d:" + if [ -d "$d" -o -h "$d" ]; then + [ -e "$d/.not_in_path" ] || path="$path$d:" + fi done [ -n "$path" ] && PATH="$path$PATH" fi # append optional directories to PATH ... for d in /usr/bin/X11 /usr/games /usr/share/php/bin; do - [ -d "$d" -o -h "$d" ] && PATH="$PATH:$d" + if [ -d "$d" -o -h "$d" ]; then + [ -e "$d/.not_in_path" ] || PATH="$PATH:$d" + fi done # set PATH so it includes user's private executables -[ -d ~/Applications ] && PATH=~/Applications:"${PATH}" -[ -d ~/bin ] && PATH=~/bin:"${PATH}" -[ -d ~/sbin ] && PATH=~/sbin:"${PATH}" +[ -d ~/Applications -a ! -e ~/Applications/.not_in_path ] \ + && PATH=~/Applications:"${PATH}" +[ -d ~/bin -a ! -e ~/bin/.not_in_path ] \ + && PATH=~/bin:"${PATH}" +[ -d ~/sbin -a ! -e ~/sbin/.not_in_path ] \ + && PATH=~/sbin:"${PATH}" # Setup MANPATH, if manpath(1) isn't available if [ ! "$(type manpath 2>/dev/null)" ]; then @@ -77,20 +98,15 @@ fi [ -r /etc/debian_chroot ] && chroot_name=$(cat /etc/debian_chroot) [ -r /etc/chroot_name ] && chroot_name=$(cat /etc/chroot_name) -# make sure $UID and $USER is set -[ -z "$UID" ] && UID=`id -u` -[ -z "$USER" ] && USER=`id -un` -export UID USER - # get my own hostname ME=`hostname 2>/dev/null` export ME # Move Xauthority file to local storage, so that sudo et all work if [ -z "$XAUTHORITY" -a -r ~/.Xauthority ]; then - cp ~/.Xauthority /tmp/Xauthority-$USER - chmod 600 /tmp/Xauthority-$USER - export XAUTHORITY="/tmp/Xauthority-$USER" + cp ~/.Xauthority /tmp/Xauthority-$LOGNAME + chmod 600 /tmp/Xauthority-$LOGNAME + export XAUTHORITY="/tmp/Xauthority-$LOGNAME" fi # read profile additions @@ -112,10 +128,10 @@ fi [ -r "/var/lib/${ME}/profile" ] && . /var/lib/${ME}/profile # Setup some directories to use local storage (no NFS) -[ -d "/usr/local/home/$USER" ] \ - || ( mkdir /usr/local/home; mkdir "/usr/local/home/$USER" ) >/dev/null 2>&1 -if [ -w "/usr/local/home/$USER" ]; then - export LOCAL_HOME="/usr/local/home/$USER" +[ -d "/usr/local/home/$LOGNAME" ] \ + || ( mkdir /usr/local/home; mkdir "/usr/local/home/$LOGNAME" ) >/dev/null 2>&1 +if [ -w "/usr/local/home/$LOGNAME" ]; then + export LOCAL_HOME="/usr/local/home/$LOGNAME" export CCACHE_DIR="$LOCAL_HOME/.ccache" export XDG_CACHE_HOME="$LOCAL_HOME/.cache" fi @@ -124,23 +140,28 @@ fi [ "$PS1" ] || return # validate terminal definition -eval `tset -s -Q` +type tset >/dev/null 2>&1 && eval `tset -s -Q` # generic shell prompt -[ "$UID" -eq 0 ] \ +[ "$LOGNAME" = "root" ] \ && PS1="<$ME> # " \ || PS1="<$ME> \$ " # icalBuddy(1) type -p icalBuddy >/dev/null 2>&1 -if [ $? -eq 0 -a "$UID" -ne 0 ]; then +if [ $? -eq 0 -a "$LOGNAME" != "root" ]; then case "$LANG" in - *.UTF*) BUL="•"; SEP="»"; ;; - *) BUL="*"; SEP=">"; ;; + *.UTF*) bul="•"; bul_imp="!"; sep="»"; ;; + *) bul="*"; bul_imp="!"; sep=">"; ;; esac - icalBuddy -f -n -npn -nc -b " $BUL " -ps "/ $SEP /" -eep "url,notes" \ - eventsToday+1 2>/dev/null | grep "$BUL" + icalBuddy -f -n -b " $bul " -ab " $bul_imp " -ps "/ $sep /" \ + -nc -npn -iep "title,due" -stda \ + tasksDueBefore:today 2>/dev/null + icalBuddy -f -n -b " $bul " -ab " $bul_imp " -ps "/ $sep /" \ + -nc -npn -iep "title,datetime" \ + eventsToday+1 2>/dev/null [ $? -eq 0 ] && echo + unset bul bul_imp sep else # remind(1) type -p remind >/dev/null 2>&1 @@ -164,8 +185,7 @@ fi # Check filesystem quotas mount 2>/dev/null | grep quota >/dev/null 2>&1 if [ $? -eq 0 ]; then - which quota >/dev/null 2>&1 - [ $? -eq 0 ] && quota -q + type quota >/dev/null 2>&1 && quota -q fi # -eof-