X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=fa3f08c600f1c65819721a0d65533cd3b998324a;hb=46bbcee1d88e19569d498c6716275b88ddecf9d0;hp=69fbe87de897040ddafa806894d6f5bd8679f241;hpb=ac850674a5599b876e4bd23bd10ca49009c43f17;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 69fbe87..fa3f08c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,7 +2,7 @@
 
 # Setup script for multimedia configuration files.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2013  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+set -e
+
 . ../lib.sh
 
-# Link setup.
-link mplayer ~/.mplayer
+
+# MPlayer and MPlayer2 use the same configuration directory.
+if installed mplayer; then
+    if mplayer --help | grep MPlayer2 >/dev/null; then
+        link mplayer2 ~/.mplayer
+    else
+        link mplayer ~/.mplayer
+    fi
+fi