Remove support for OS X

I haven't been using OS X for many years so remove this unused and
outdated code and config.

diff --git a/lib.sh b/lib.sh
index aa4679914e2c32aaf1ca33ab39fb32fac6b1c498..6df53110c3e39b60416a9c9ce6d05abe4257d619 100644 (file)
--- a/lib.sh
+++ b/lib.sh
@@ -111,7 +111,6 @@ simple_cpp() {
 #
 # - Debian (debian)
 # - Gentoo (gentoo)
-# - Mac OS X (darwin)
 # - Solaris/OpenSolaris (sun)
 # - FreeBSD (freebsd)
 #
@@ -121,8 +120,6 @@ os() {
         echo debian
     elif test -f /etc/gentoo-release; then
         echo gentoo
-    elif test x`uname` = xDarwin; then
-        echo darwin
     elif test x`uname` = xSunOS; then
         echo sun
     elif test x`uname` = xFreeBSD; then

diff --git a/os/darwin/environment.plist b/os/darwin/environment.plist
deleted file mode 100644 (file)
index 6c87ec5..0000000
--- a/os/darwin/environment.plist
+++ /dev/null
@@ -1 +0,0 @@
-{ PATH = "/opt/local/bin:/opt/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; }

diff --git a/os/setup.sh b/os/setup.sh
index dc3a3417508f252cebe56a0f1f4762d3abc2e48f..75061c9ad9907bef3caba7a269715efd357c18ee 100755 (executable)
--- a/os/setup.sh
+++ b/os/setup.sh
@@ -23,11 +23,6 @@ set -eu
 . ../lib.sh
 
 
-if test x"`os`" = xdarwin; then
-    # Sets a custom PATH for GUI applications.
-    mkdir -p ~/.MacOSX
-    link darwin/environment.plist ~/.MacOSX/environment.plist
-fi
 if test x"`os`" = xdebian; then
     # Necessary as aptitude rewrites the config file on every start.
     generate debian/aptitude/config .in cat

diff --git a/x11/setup.sh b/x11/setup.sh
index a93d357ec98934b346283c3558fd2385f7738517..7dbbce23a9b1800a78a0a982ed6fd21c48dfe77d 100755 (executable)
--- a/x11/setup.sh
+++ b/x11/setup.sh
@@ -59,12 +59,10 @@ if installed X; then
         sed_i 's/^!NO_COMPTON //' Xresources
     fi
 
-    if test ! "x`os`" = xdarwin; then
-        link xinitrc ~/.xinitrc
-        # Most display managers use ~/.xsession instead of ~/.xinitrc (which
-        # is used by e.g. startx). Provide both links.
-        link xinitrc ~/.xsession
-    fi
+    link xinitrc ~/.xinitrc
+    # Most display managers use ~/.xsession instead of ~/.xinitrc (which
+    # is used by e.g. startx). Provide both links.
+    link xinitrc ~/.xsession
     if test -f xinitrc.local; then
         link xinitrc.local ~/.xinitrc.local
     fi