Use dialog engine to monitor progress and get sudo password
Signed-off-by: Keith Packard <keithp@keithp.com>
LINUX_EXTRA=altosui-fat
MACOSX_INFO_PLIST=Info.plist
LINUX_EXTRA=altosui-fat
MACOSX_INFO_PLIST=Info.plist
-MACOSX_INSTALL=install-macosx
+MACOSX_INSTALL=install-macosx ask-pass
MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf $(MACOSX_ICONS) $(MACOSX_INSTALL)
MACOSX_EXTRA=$(FIRMWARE)
MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf $(MACOSX_ICONS) $(MACOSX_INSTALL)
MACOSX_EXTRA=$(FIRMWARE)
--- /dev/null
+#!/bin/bash
+osascript -e 'display dialog "Password:" with hidden answer default answer "" with title "Password for '$USER'"' -e 'text returned of result'
+JVM=/Library/Java/JavaVirtualMachines
+dir=`dirname "$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" "$@"
+ SUDO_ASKPASS="${dir}/ask-pass" sudo -A "$0" "$@"
+ exit 0
+# Check for java
+if ls "$JVM" | grep -q adopt; then
+ echo "Adopt OpenJDK already present"
+else
+ open https://adoptopenjdk.net/
+ osascript -e 'display dialog "Install Java from https://adoptopenjdk.net then click Continue" buttons {"Continue"} default button 1 with title "Install Java"' >/dev/null
+fi
+
LIBRARY=/Library/AltusMetrum
LIBRARY=/Library/AltusMetrum
-APPLICATIONS=/Applications/
+APPLICATIONS=/Applications
+INSTALLED=
+ echo 'Installing' "$file"
+ case "$file" in
- mkdir -p "$(APPLICATIONS)"
- if [ -d "$(APPLICATIONS)/$(APP)/." ]; then
- rm -rf "$(APPLICATIONS)/$(APP)"
+ mkdir -p "${APPLICATIONS}"
+ if [ -d "${APPLICATIONS}/${file}" ]; then
+ rm -rf "${APPLICATIONS}/${file}"
- cp -a "$i" "$(APPLICATIONS)/$(APP)"
- chmod +w "$(APPLICATIONS)/$(APP)"/*
- xattr -c "$(APPLICATIONS)/$(APP)"/*
+ cp -a "$file" "${APPLICATIONS}/${file}"
+ chmod -R +w "${APPLICATIONS}/${file}"
+ xattr -rc "${APPLICATIONS}/${file}"
+ APP=`basename "$file" .app`
+ INSTALLED="${INSTALLED} ${APP}"
- mkdir -p "$(LIBRARY)"
- cp -a "$i" "$(LIBRARY)"
+ mkdir -p "${LIBRARY}"
+ cp -a "$file" "${LIBRARY}"
+osascript -e 'display dialog "Installation of'"${INSTALLED}"' complete" with title "Installation Complete" buttons {"OK"} default button 1' >/dev/null
MACOSX_INFO_PLIST=Info.plist
MACOSX_README=ReadMe-Mac.rtf
MACOSX_INFO_PLIST=Info.plist
MACOSX_README=ReadMe-Mac.rtf
-MACOSX_INSTALL=../altosui/install-macosx
+MACOSX_INSTALL=../altosui/install-macosx ../altosui/ask-pass
MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVERS) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) $(MACOSX_INSTALL)
$(MACOSX_DRIVER_0):
MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVERS) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) $(MACOSX_INSTALL)
$(MACOSX_DRIVER_0):
MACOSX_INFO_PLIST=Info.plist
MACOSX_README=ReadMe-Mac.rtf
MACOSX_INFO_PLIST=Info.plist
MACOSX_README=ReadMe-Mac.rtf
-MACOSX_INSTALL=../altosui/install-macosx
+MACOSX_INSTALL=../altosui/install-macosx ../altosui/ask-pass
MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) $(MACOSX_INSTALL)
MACOSX_EXTRA=$(FIRMWARE)
MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) $(MACOSX_INSTALL)
MACOSX_EXTRA=$(FIRMWARE)