Handle errors more intelligently

3 files changed, 8 insertions, 6 deletions

diff --git a/.bashrc b/.bashrc
index 045bd9c..9192d66 100644
--- a/.bashrc
+++ b/.bashrc
@@ -97,7 +97,9 @@ if [ -f /etc/bash_completion ]; then
     . /etc/bash_completion
 fi
 
-export TMPDIR="$HOME/tmp"
-daemon emacs --daemon
-daemon sysfiles
-daemon maildirproc
+if [ "$TERM" != dumb ]; then
+    export TMPDIR="$HOME/tmp"
+    daemon emacs --daemon
+    daemon sysfiles
+    daemon maildirproc
+fi
diff --git a/.profile b/.profile
index ec14112..2d78601 100644
--- a/.profile
+++ b/.profile
@@ -30,4 +30,4 @@ if [ -f "$HOME/.selected_editor" ]; then
     export VISUAL="${VISUAL:-$SELECTED_EDITOR}"
 fi
 
-alsactl --file $HOME/.alsa.save restore
+alsactl --file $HOME/.alsa.save restore &> /dev/null || true
diff --git a/Makefile b/Makefile
index 15857ab..998ff62 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ clean:
 	rm -f $(targets)
 
 .alsa.save: FORCE
-	-alsactl --file $(HOME)/.alsa.save store
+	alsactl --file $(HOME)/.alsa.save store || touch '$@'
 
 .nanorc: .nanorc.in $(NANO_SHARE)
 	cat '$<' > '$@'