Fixed outstanding bugs with Xcode and password loop.

Author: galaxy4public

CHANGELOG.md

@@ -1,3 +1,11 @@
+1.3.1
+-----
+
+- Fixed a bug where the installation script went into the infinite loop asking
+  the user for volume's password with no way to cancel the activity;
+- Hopefully, addressed an issue where the installation script was not waiting
+  for Xcode's installation to complete.
+
 1.3.0
 -----
 

build/Distribution.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <installer-gui-script minSpecVersion="2">
     <title>BootUnlock</title>
-    <product id="au.com.openwall.BootUnlock" version="1.3.0" />
+    <product id="au.com.openwall.BootUnlock" version="1.3.1" />
     <background file="background.png" scaling="proportional" alignment="bottomleft"/>
     <welcome file="welcome.rtf"/>
     <readme file="readme.rtf"/>
@@ -20,5 +20,5 @@
     <choice id="au.com.openwall.BootUnlock" visible="false">
         <pkg-ref id="au.com.openwall.BootUnlock"/>
     </choice>
-    <pkg-ref id="au.com.openwall.BootUnlock">BootUnlock-1.3.0-dist.pkg</pkg-ref>
+    <pkg-ref id="au.com.openwall.BootUnlock">BootUnlock-1.3.1-dist.pkg</pkg-ref>
 </installer-gui-script>

build/build.sh

@@ -7,7 +7,7 @@ NAME="BootUnlock"
 IDENTIFIER="au.com.openwall.$NAME"
 
 # Package version number.
-VERSION="1.3.0"
+VERSION="1.3.1"
 
 # The location to copy the contents of files.
 INSTALL_LOCATION="/Library/PrivilegedHelperTools/$IDENTIFIER"

files/update.sh

@@ -113,6 +113,15 @@ for V in "${VOLUME[@]}" ; do
 			promptPassword('Please provide the passphrase for volume \"$NAME\":')
 		")
 
+		if [ -z "PASSPHRASE" ]; then
+			osascript -e "display alert \"BootUnlock\" message \"
+You did not specfy the passphrase for the selected volume(s), so BootUnlock is not going to do anything at the system boot up time.
+
+If you reconsider and will want to enable unlocking of a particular volume you can re-run the '$SELF' script at a later time
+		\" as critical" &>/dev/null
+			exit 0
+		fi
+
 		if printf '%s' "$PASSPHRASE" | diskutil apfs unlock "$DEVICE" -stdinpassphrase -verify -user "$UUID"; then
 			printf 'Adding password for volume "%s" with UUID %s to the System keychain...\n' "$NAME" "$UUID"
 			if sudo /usr/bin/security add-generic-password \
@@ -140,4 +149,3 @@ If you believe that you are providing the correct password, yet it is not recogn
 		fi
 	done
 done
-

scripts/preinstall

@@ -3,5 +3,13 @@
 set -eu -o pipefail
 
 if ! xcode-select -p >/dev/null 2>&1; then
+	osascript -e "display alert \"BootUnlock\" message \"
+The required Xcode command-line tools have not been found on the system, requesting the installation.
+
+The installation process is going to wait until Xcode command-line tools are installed (may need your confirmation in another dialog).
+\" as critical" &>/dev/null
 	xcode-select --install ||:
+	until xcode-select -p >/dev/null 2>&1; do
+		sleep 1
+	done
 fi