diff options
| -rw-r--r-- | .bashrc | 7 | ||||
| -rw-r--r-- | .login-daemons | 7 | ||||
| -rw-r--r-- | .profile | 22 | ||||
| -rw-r--r-- | Makefile | 4 |
4 files changed, 28 insertions, 12 deletions
@@ -96,9 +96,6 @@ if [ -f /etc/bash_completion ]; then . /etc/bash_completion fi -if [ "$TERM" != dumb ]; then - export TMPDIR="$HOME/tmp" - daemon emacs --daemon - daemon sysfiles - daemon maildirproc +if [ -f "$HOME/.login-daemons" ]; then + . "$HOME/.login-daemons" fi diff --git a/.login-daemons b/.login-daemons new file mode 100644 index 0000000..5b8851e --- /dev/null +++ b/.login-daemons @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -x "`which daemon`"]; then + daemon emacs --daemon + daemon sysfiles + daemon maildirproc +fi @@ -16,12 +16,10 @@ for dir in $bins; do fi done -# if running bash -if [ -n "$BASH_VERSION" ]; then - # include .bashrc if it exists - if [ -f "$HOME/.bashrc" ]; then - . "$HOME/.bashrc" - fi +if [ -d "$HOME/tmp"]; then + export TMPDIR="$HOME/tmp" +elif [ -d "$HOME/.prefix/tmp"]; then + export TMPDIR="$HOME/.prefix/tmp" fi # set SELECTED_EDITOR, EDITOR, and VISUAL to set the text editor used @@ -33,6 +31,18 @@ if [ -f "$HOME/.selected_editor" ]; then export VISUAL="${VISUAL:-$SELECTED_EDITOR}" fi +if [ -f "$HOME/.login-daemons" ]; then + . "$HOME/.login-daemons" +fi + +# if running bash +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi + if [ -x "`which alsactl`" ]; then alsactl --file $HOME/.alsa.save restore &> /dev/null || true fi @@ -1,13 +1,15 @@ CHECK = $(HOME)/.prefix:$(HOME):/usr/local:/usr:/ NANO_SHARE = $(firstword $(wildcard $(addsuffix /share/nano,$(subst :, ,$(CHECK))))) +ALSACTL=$(firstword $(shell which alsactl) echo) + targets=.nanorc .folders .crontab.cookie .alsa.save all: $(targets) clean: rm -f $(targets) .alsa.save: FORCE - alsactl --file $(HOME)/.alsa.save store || touch '$@' + $(ALSACTL) --file $(HOME)/.alsa.save store || touch '$@' .nanorc: .nanorc.in $(NANO_SHARE) cat '$<' > '$@' |