use set -eu

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 6adcb7ce6ed8d1860add5f52692f4c9e9bd91d6b..2d6e9b296f001a90191484597aa7a2458dcd0743 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -18,21 +18,24 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 . ../lib.sh
 
 
-generate cat mutt/display .in
+generate mutt/display .in cat
 if mutt -v | grep sidebar >/dev/null 2>&1; then
     echo 'mutt/display: enabling mutt sidebar settings'
-    sed 's/^#set sidebar_/set sidebar_/' mutt/display > mutt/display.tmp
-    mv mutt/display.tmp mutt/display
+    sed_i 's/^#set sidebar_/set sidebar_/' mutt/display
 fi
 
 # Link setup.
-link abook ~/.abook
+if installed abook; then
+    link abook ~/.abook
+fi
 link gnupg ~/.gnupg
-link lbdbrc ~/.lbdbrc
+if installed lbdb; then
+    link lbdbrc ~/.lbdbrc
+fi
 link mailcap ~/.mailcap
 link mutt ~/.mutt