# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change: Don Dez 06 23:21:08 CET 2007 [mika]
################################################################################
# This file is sourced on all invocations of the shell.
# It is the 1st file zsh reads; it's read for every shell,
else
# support extra software in special directory outside of squashfs environment in live-cd mode
if [[ -f /etc/grml_cd ]] ; then
- [[ -d /cdrom/addons/ ]] && ADDONS=':/cdrom/addons/'
+ [[ -r /cdrom/addons ]] && ADDONS=':/cdrom/addons'
+ [[ -r /live/image/addons ]] && ADDONS=':/live/image/addons'
+ [[ -r /etc/grml/my_path ]] && ADDONS=":$(cat /etc/grml/my_path)"
fi
if (( EUID != 0 )); then
fi
fi
-# Solaris
-# case $(uname 2>/dev/null) in
-# SunOS)
-# PATH="/usr/bin:/usr/sbin:/usr/ccs/bin:/usr/sfw/bin:/opt/sfw/bin:/opt/bin:/usr/local/bin:/usr/openwin/bin:/usr/dt/bin:/usr/ucb:/usr/proc/bin:~/bin"
-# # LD_LIBRARY_PATH="/opt/csw/lib:/opt/sfw/lib:/usr/lib:/usr/local/lib:/usr/ccs/lib:/usr/openwin/lib:/usr/ucb/lib"
-# # MANPATH="$MANPATH:/opt/csw/man:/usr/man:/usr/share/man:/usr/local/man:/opt/sfw/man"
-#esac
+# Solaris
+case $(uname 2>/dev/null) in
+ SunOS)
+ PATH="/usr/bin:/usr/sbin:/usr/ccs/bin:/opt/SUNWspro/bin:/usr/ucb:/usr/sfw/bin:/usr/gnu/bin:/usr/openwin/bin:/opt/csw/bin:/opt/swf/bin:/sbin:/usr/sbin:~/bin"
+ # LD_LIBRARY_PATH="/opt/csw/lib:/opt/sfw/lib:/usr/lib:/usr/local/lib:/usr/ccs/lib:/usr/openwin/lib:/usr/ucb/lib"
+ # MANPATH="$MANPATH:/opt/csw/man:/usr/man:/usr/share/man:/usr/local/man:/opt/sfw/man"
+esac
# less (:=pager) options:
# export LESS=C
fi
export READNULLCMD=${PAGER:-/usr/bin/pager}
-# support termcap colors when using PAGER=less:
-# TODO: move these to zshrc, they are only relevant in interactive shells
-export LESS_TERMCAP_mb=$'\E[01;31m'
-export LESS_TERMCAP_md=$'\E[01;31m'
-export LESS_TERMCAP_me=$'\E[0m'
-export LESS_TERMCAP_se=$'\E[0m'
-export LESS_TERMCAP_so=$'\E[01;44;33m'
-export LESS_TERMCAP_ue=$'\E[0m'
-export LESS_TERMCAP_us=$'\E[01;32m'
-
# allow zeroconf for distcc
export DISTCC_HOSTS="+zeroconf"