X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=2e37a2e6821b3b7e2f11df7c1c72bd6668991689;hb=31d4c9c6367cc8a457c28afe9e6855757f4318a1;hp=01217a1edc6c524d6c6284c1db00ed9dcaf4d6cb;hpb=9ff40b109db01c9d5e1812e003138a67f8ac9847;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 01217a1..2e37a2e 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-2014  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,16 +18,42 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 . ../lib.sh
 
 
 # MPlayer and MPlayer2 use the same configuration directory.
 if installed mplayer; then
+    cleanup() {
+        if test -h ~/.mplayer; then
+            # Setup already done.
+            return
+        fi
+        # Try to remove a default config file from ~/.mplayer. Necessary
+        # because it's also created by mplayer --help.
+        if test -f ~/.mplayer/config; then
+            sha=`shasum ~/.mplayer/config | awk '{print $1}'`
+            if test x"$sha" = x60f98ca2f1f3f81ce3ea2aa3e0e85e8c57e7db40; then
+                rm ~/.mplayer/config
+            else
+                echo '~/.mplayer/config: found modifications, aborting' >&2
+                exit 1
+            fi
+        fi
+        rmdir ~/.mplayer 2>/dev/null || true
+    }
+
     if mplayer --help | grep MPlayer2 >/dev/null; then
+        cleanup
         link mplayer2 ~/.mplayer
     else
+        cleanup
         link mplayer ~/.mplayer
     fi
 fi
+# Another MPlayer fork, but developed separately with a different config
+# directory.
+if installed mpv; then
+    link mpv ~/.config/mpv
+fi