use MACHTYPE variable for architecture selection (much easier)

Author: phst

texlive-arch.sh

@@ -2,26 +2,18 @@
 
 set -e
 
-system="$(uname -s)"
-machine="$(uname -m)"
-
-case "$system" in
-    MINGW*)
-        arch=win32 ;;
-    Darwin)
-        [[ "$(sysctl -n hw.optional.x86_64)" == 1 ]] && arch=x86_64-darwin || arch=universal-darwin ;;
-    Linux)
-        case "$machine" in
-            x86_64)    arch=x86_64-linux ;;
-            i386|i686) arch=i386-linux   ;;
-        esac
-        ;;
+case "$MACHTYPE" in
+    i[36]86-*-msys*)
+        echo win32 ;;
+    x86_64-*-darwin10.*)
+        echo x86_64-darwin ;;
+    i386-*-darwin*)
+        echo universal-darwin ;;
+    x86_64-*-linux*)
+        echo x86_64-linux ;;
+    i[36]86-*-linux*)
+        echo i386-linux ;;
+    *)
+        echo "Could not determine native TeX Live architecture from system type $system and machine type $machine" >&2
+        exit 1
 esac
-
-if [[ -n "$arch" ]]
-then
-    echo "$arch"
-else
-    echo "Could not determine native TeX Live architecture from system type $system and machine type $machine" >&2
-    exit 1
-fi