X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2Finstall-macosx;fp=altosui%2Finstall-macosx;h=aced4ab9280748189f137f223b4b72cdb33fc3db;hp=aebfd5276d58fbab1162b513f38979005c805912;hb=ffbd99545ca0462161c24e0ed86978544f2c28f6;hpb=521dc6dbf9aa5f7aad7829cd98a815031725ac24

diff --git a/altosui/install-macosx b/altosui/install-macosx
index aebfd527..aced4ab9 100755
--- a/altosui/install-macosx
+++ b/altosui/install-macosx
@@ -1,9 +1,37 @@
-#!/bin/sh
+#!/bin/bash
+
+case `id -u` in
+    0)
+    ;;
+    *)
+	# Check for java
+	if [ ! -d /Library/Java/JavaVirtualMachines/ -o `ls /Library/Java/JavaVirtualMachine` == '' ]; then
+	    open https://adoptopenjdk.net/
+	    osascript -e 'display dialog "Install Java from https://adoptopenjdk.net then click OK" buttons {"Continue"}'
+	fi
+	sudo "$0" "$@"
+	;;
+esac
+
 dir=`dirname "$0"`
 cd "$dir"
-mkdir -p ~/Applications/AltOS
-find ~/Applications/AltOS -type d -print0 | xargs -0 chmod +w
-cp -f -a * ~/Applications/AltOS
-cd ~/Applications/AltOS
-chmod +w *
-xattr -c *
+APP=`echo *.app`
+LIBRARY=/Library/AltusMetrum
+APPLICATIONS=/Applications/
+for file in *; do
+    case "$i" in
+	*.app)
+	    mkdir -p "$(APPLICATIONS)"
+	    if [ -d "$(APPLICATIONS)/$(APP)/." ]; then
+		rm -rf "$(APPLICATIONS)/$(APP)"
+	    fi
+	    cp -a "$i" "$(APPLICATIONS)/$(APP)"
+	    chmod +w "$(APPLICATIONS)/$(APP)"/*
+	    xattr -c "$(APPLICATIONS)/$(APP)"/*
+	    ;;
+	*)
+	    mkdir -p "$(LIBRARY)"
+	    cp -a "$i" "$(LIBRARY)"
+	    ;;
+    esac
+done