Update vo_dependency_installer.sh

Author: dn538j

vo_dependency_installer.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #=======================================
-# Copyright 2022, 2023 AT&T
+# Copyright 2022, 2023, 2024 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 
 #=======================================
 # vo_dependency_installer.sh
-VERSION="1.0.1.3"
+VERSION="1.0.2.0"
 #
 # Howto use this script:
 #   From your browser, select 'Save' and choose or create an empty folder. Make sure the script has the extension '.sh'.
@@ -44,19 +44,17 @@ VERSION="1.0.1.3"
 # Some of the depenancies do not have functional formula to allow 'brew' to install them, 
 # and there for must be cloned from github and compiled.
 # 
-# These include 'ifuse' and 'libimobiledevice-glue'
 # see:
 #   git clone https://github.com/libimobiledevice/ifuse.git
-#   git clone https://github.com/libimobiledevice/libimobiledevice-glue.git
 # 
 # There are some basic requirements before this script can be run.
 # 1 You must have and run this under an Admin account, do not launch under 'sudo'
-# 2 macOS 13.4 or 13.4.1
-# 3 Xcode 14.3.1
+# 2 macOS 14
+# 3 Xcode 16
 # 4 brew (aka HomeBrew https://brew.sh) 
 # 
 # Testing:
-# This script has been tested on Macbook Pro intel and M1 machines running Monterey 12.6 and Ventura early December 2022
+# This script has been tested on Macbook Pro intel and M1 machines running os 14.5, 15.0 on intel and Apple Silicon
 # 	Ventura 13.2.1 Mar 31, 2023
 #   Ventura 13.4.1, Intel & M1 July 18 2023
 # 
@@ -68,14 +66,12 @@ echo "
 	if [ -f "`which brew`" ]
 	then
 		brew update
-		brew upgrade
-		brew tap homebrew/core
 
 		# make sure we can compile
 		brew install cmake
-		brew install automake
 		brew install autogen
 		brew install autoconf
+		brew install automake
 
 	else
 		echo "failed to find brew" >> error
@@ -92,104 +88,24 @@ echo ">>>>> uninstall <<<<<"
 	brew uninstall --ignore-dependencies libplist 2>/dev/null
 	brew uninstall --ignore-dependencies libimobiledevice 2>/dev/null
 	brew uninstall --ignore-dependencies ifuse 2>/dev/null
-	brew uninstall --ignore-dependencies openssl 2>/dev/null
 	sudo rm `which ifuse` 2>/dev/null
-}
-
-#=======================================
-function compile_libimobiledevice-glue () {
-echo ""
-echo ">>>>> compile_libimobiledevice-glue <<<<<"
-
-	# install dependencies
-	# 1 libplist non-head version
-	
-	brew install --head libplist
 
-	if [ "${PWD##*/}" = "libimobiledevice-glue" ]; then
-		if [ "${ARCH_NAME}" = "x86_64" ]; then
-			touch "__compile_x86"
-			echo "./autogen.sh --prefix=/usr/local"
- 			./autogen.sh --prefix=/usr/local
-			make
-			echo "sudo make install"
-			sudo make install
-			ln -s /usr/local/lib/pkgconfig/libimobiledevice-glue-1.0.pc /usr/local/opt/libplist/lib/pkgconfig/libimobiledevice-glue-1.0.pc 
-		else
-			touch "__compile_aarch"
-			echo "./autogen.sh --prefix=/opt/homebrew"
-	 		./autogen.sh --prefix=/opt/homebrew
-	 		make
-	 		make install
-			ln -s /opt/homebrew/lib/pkgconfig/libimobiledevice-glue-1.0.pc /opt/homebrew/opt/libplist/lib/pkgconfig/libimobiledevice-glue-1.0.pc  
-		fi
-	else
-		echo "libimobiledevice-glue failure, in wrong path: `pwd`"
-		exit_install
-	fi
 }
 
 #=======================================
 function install_libimobiledevice () {
-echo ""
-echo ">>>>> install_libimobiledevice <<<<<"
-	
-	brew uninstall --ignore-dependencies libimobiledevice 2>/dev/null
-	
-	brew install --head usbmuxd
-# 	brew install --head libplist
-	brew install --head libimobiledevice
-	brew unlink libimobiledevice && brew link libimobiledevice
+	brew install usbmuxd
+	brew install libplist
+	brew install libimobiledevice
 }
-
 #=======================================
 # install ifuse
-# plus openssl
+#=======================================
 function install_ifuse () {
 echo ""
-echo ">>>>> install_ifuse <<<<<"
-
-# install dependencies
-	# 1 libimobiledevice non-head version for openssl
-	# 2 openssl
-	
-	install_libimobiledevice
-	brew install openssl
-	
-	LISTING=$(brew list openssl)
-	regex="(^.*)(/Cellar.*@[0-9]{0,9}/)(.*)/bin/openssl"
+echo ">>>>> build & install_ifuse <<<<<"
 
-	PATH_OSSL=""
-	VERSION_OSSL=""
-	for f in $LISTING
-	do
-	# 	echo $f
-		if [[ "$f" =~ $regex ]]
-		then
-			echo "found in <<$f>>"
-			PATH_OSSL="${BASH_REMATCH[1]}"
-			MID="${BASH_REMATCH[2]}"
-			VERSION_OSSL="${BASH_REMATCH[3]}"
-			break
-		fi
-	done
-	
-	echo "==============================="
-	echo "version = $VERSION_OSSL"
-	echo "path = $PATH_OSSL"
-	echo "mid = $MID"
-	
-	if [ -f $PATH_OSSL$MID$VERSION_OSSL/lib/pkgconfig/openssl.pc ] 
-	then
-		ln -sF $PATH_OSSL$MID$VERSION_OSSL/lib/pkgconfig/openssl.pc $PATH_OSSL/lib/pkgconfig/openssl.pc
-		ln -sF $PATH_OSSL$MID$VERSION_OSSL/lib/pkgconfig/libssl.pc $PATH_OSSL/lib/pkgconfig/libssl.pc
-		ln -sF $PATH_OSSL$MID$VERSION_OSSL/lib/pkgconfig/libcrypto.pc $PATH_OSSL/lib/pkgconfig/libcrypto.pc
-	else
-		echo "install_ifuse (): failed to symlink openSSL" >> error
-		exit_install
-	fi
-	
-	# now compile ifuse
+# if [ "${PWD##*/}" = "ifuse" ]; then
 	./autogen.sh  
 	make
 	echo "sudo make install"
@@ -205,27 +121,13 @@ echo ""
 
 	echo "Archetecture $ARCH_NAME"
 	echo "$0 $VERSION"
-	echo "============================ prepare ============================"
-	if [[ -d /Library/PreferencePanes/macFUSE.prefPane ]]; then
-	  init_brew
-	  do_uninstall
-	else
-	  echo "MacFuse not detected"
-	  echo "To install, visit https://osxfuse.github.io"
-	fi
+	init_brew
+	do_uninstall
 
-	echo "============================ libimobiledevice-glue ============================"
-	rm -fr libimobiledevice-glue
-	git clone https://github.com/libimobiledevice/libimobiledevice-glue.git
-	# unzip ../bu/libimobiledevice-glue.zip -d ./ ; rm -fr __MACOSX
-	if [ -d libimobiledevice-glue ]; then
-		( cd libimobiledevice-glue && compile_libimobiledevice-glue )
-	else
-		echo "clone: failed to git clone https://github.com/libimobiledevice/libimobiledevice-glue.git" >> error
-		exit_install
-	fi
-
-	echo "============================ compile iFuse ============================"
+	echo ">>>>> install_libimobiledevice <<<<<"
+	install_libimobiledevice
+	
+	echo "============================ clone iFuse ============================"
 	rm -fr ifuse
 	git clone https://github.com/libimobiledevice/ifuse.git
 	# unzip ../bu/ifuse.zip -d ./ ; rm -fr __MACOSX
@@ -259,6 +161,7 @@ function exit_install (){
 # 	5: <$5> sub:1 version
 # 	6: <$6> sub:1 version
 #   7: <$7> full version
+# check_version "$BREW_CONFIG" "$regex" CLT 15 0 0 "CLT: 15.3.0.0.1.1708646388"
 function check_version () {
 
 	txt=$1
@@ -269,7 +172,6 @@ function check_version () {
 	M3=$6
 	F_VERSION=$7
 
-# 	echo "[check $label]"	
 	if [[ "$txt" =~ $rgx ]]
 	then
 		V_CHECK="pass"
@@ -332,11 +234,11 @@ function machine_precheck (){
 
 	# CLT: 14.2.0.0.1.1668646533
 	regex="(CLT): ([0-9A-Za-z/]*)\.([0-9]*)\.([0-9]*)"
-	check_version "$BREW_CONFIG" "$regex" CLT 14 3 0 14.2.0 "CLT: 14.3.0.0.1.1668646533"
+	check_version "$BREW_CONFIG" "$regex" CLT 16 1 0 "CLT: 16.1"
 
 	# Xcode: 14.1
 	regex="(Xcode): ([0-9]*)\.([0-9]*)"
-	check_version "$BREW_CONFIG" "$regex" Xcode 14 3 "" "Xcode: 14.3"
+	check_version "$BREW_CONFIG" "$regex" Xcode 16 0 "" "Xcode: 16.0"
 	echo $CHECK
 
 	if [[ ${CHECK} = "fail"* ]] ; then
@@ -368,52 +270,31 @@ if [ ! "$PTH" = "" ]; then
 	exit_install
 fi
 
-# machine_precheck > error.log
+machine_precheck > error.log
 
-# test=`cat error.log|grep "ready to proceed"`
+test=`cat error.log|grep "ready to proceed"`
 
-# if [[ "$test" != "ready to proceed"* ]];then
-# 	cat error.log
-# 	echo ""
-# 	echo "Aborting $0, no changes to your system"
-# 	exit_install
-# else
-# 	rm error.log
-# 	echo $test
-# fi
+if [[ "$test" != "ready to proceed"* ]];then
+	cat error.log
+	echo ""
+	echo "Aborting $0, no changes to your system"
+	exit_install
+else
+	rm error.log
+	echo $test
+fi
 
 #-----------------------------------------------------
 # version pre-checks DONE
 #   will now configure system
 #-----------------------------------------------------
 
-if [ ! "${PWD##*/}" = "libimobile_installation" ]
-then
-	if [ ! -d libimobile_installation ]
-	then
-		echo "create libimobile_installation"
-		mkdir "libimobile_installation"
-	fi
-	if [ -d libimobile_installation ]
-	then
-		echo "cd into libimobile_installation folder and launch do_install"
-		( cd libimobile_installation  && (do_install | tee vo_install.log))
-		exit_install
-	else
-		echo "$0: Failed to create the temporary directory 'libimobile_installation'"
-		exit_install
-	fi
-	# 
-else
-	echo "Please exit the folder 'libimobile_installation'"
-	exit_install
-fi
+do_install
 
 if [ -f "./error" ]
 then
 	cat error
 	exit_install
 else
 	echo "No errors"
-	rm -fr libimobile_installation
 fi