first "working" implementation of pkg support

Installomator.sh

@@ -31,31 +31,31 @@ fi
 #
 #   the team ID is the ten-digit ID at the end of the line starting with 'origin='
 # 
-# - dmgName: (optional)
+# - archiveName: (optional)
 #   The name of the downloaded dmg
-#   When not given the dmgName is derived from the last part of the downloadURL
+#   When not given the archiveName is derived from the last part of the downloadURL
 #
 # - appName: (optional)
 #   file name of the app bundle in the dmg to verify and copy (include .app)
-#   When not given, the App name is derived from the dmgName by removing the extension
+#   When not given, the App name is derived from the archiveName by removing the extension
 #   and adding .app
 #
 # - targetDir: (optional)
 #   Applications will be copied to this directory, remember to omit trailing '/'
-#   default value is '/Applications'
-
-targetDir="/Applications"
-
+#   default value is '/Applications' for dmg and zip installations
+#   for pkgs default targetDir is "/"
 
 # todos:
 
 # TODO: add pkg support
+# TODO: add zip support
 # TODO: check for running processes and either abort or prompt user
 # TODO: log version of installed software
 # TODO: notification when done
 
 # functions to help with getting info
 
+# will get the latest release download from a github repo
 downloadURLFromGit() { # $1 git user name, $2 git repo name
     gitusername=${1?:"no git user name"}
     gitreponame=${2?:"no git repo name"}
@@ -89,13 +89,17 @@ case $identifier in
         ;;
     Firefox)
         downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
-        dmgName="Firefox.dmg"
+        archiveName="Firefox.dmg"
         expectedTeamID="43AQ936H96"
         ;;
     WhatsApp)
         downloadURL="https://web.whatsapp.com/desktop/mac/files/WhatsApp.dmg"
         expectedTeamID="57T9237FN3"
         ;;
+    desktoppr)
+        downloadURL=$(downloadURLFromGit "scriptingosx" "desktoppr")
+        expectedTeamID="JME5BW3F3R"
+        ;;
     
     # these identifiers exist for testing
     brokenDownloadURL)
@@ -120,14 +124,7 @@ case $identifier in
         ;;
 esac
 
-if [ -z "$dmgName" ]; then
-    dmgName="${downloadURL##*/}"
-fi
-
-if [ -z "$appName" ]; then
-    appName="${dmgName%%.*}.app"
-fi
-
+# functions
 cleanupAndExit() { # $1 = exit code
     if [ "$DEBUG" -eq 0 ]; then
         # remove the temporary working directory when done
@@ -145,39 +142,12 @@ cleanupAndExit() { # $1 = exit code
     exit "$1"
 }
 
-# create temporary working directory
-tmpDir=$(mktemp -d )
-if [ "$DEBUG" -eq 1 ]; then
-    # for debugging use script dir as working directory
-    tmpDir=$(dirname "$0")
-fi
-
-# change directory to temporary working directory
-echo "Changing directory to $tmpDir"
-if ! cd "$tmpDir"; then
-    echo "error changing directory $tmpDir"
-    #rm -Rf "$tmpDir"
-    cleanupAndExit 1
-fi
-
-# TODO: when user is logged in, and app is running, prompt user to quit app
-
-if [ -f "$dmgName" ] && [ "$DEBUG" -eq 1 ]; then
-    echo "$dmgName exists and DEBUG enabled, skipping download"
-else
-    # download the dmg
-    echo "Downloading $downloadURL to $dmgName"
-    if ! curl --location --fail --silent "$downloadURL" -o "$dmgName"; then
-        echo "error downloading $downloadURL"
-        cleanupAndExit 2
-    fi
-fi
-
+installFromDMG() {
     # mount the dmg
-echo "Mounting $tmpDir/$dmgName"
+    echo "Mounting $tmpDir/$archiveName"
     # set -o pipefail
-if ! dmgmount=$(hdiutil attach "$tmpDir/$dmgName" -nobrowse -readonly | tail -n 1 | cut -c 54- ); then
-    echo "Error mounting $tmpDir/$dmgName"
+    if ! dmgmount=$(hdiutil attach "$tmpDir/$archiveName" -nobrowse -readonly | tail -n 1 | cut -c 54- ); then
+        echo "Error mounting $tmpDir/$archiveName"
         cleanupAndExit 3
     fi
     echo "Mounted: $dmgmount"
@@ -211,7 +181,7 @@ if [ "$(whoami)" != "root" ]; then
         fi
     
         echo "DEBUG enabled, skipping copy and chown steps"
-    cleanupAndExit 0
+        return 0
     fi
 
     # remove existing application
@@ -236,6 +206,117 @@ if [ -n "$currentUser" ]; then
     else
         echo "No user logged in, not changing user"
     fi
+}
+
+installFromPKG() {
+    # verify with spctl
+    echo "Verifying: $archiveName"
+    if ! teamID=$(spctl -a -vv -t install "$archiveName" 2>&1 | awk '/origin=/ {print $NF }' ); then
+        echo "Error verifying $archiveName"
+        cleanupAndExit 4
+    fi
+
+    echo "Team ID: $teamID (expected: $expectedTeamID )"
+
+    if [ "($expectedTeamID)" != "$teamID" ]; then
+        echo "Team IDs do not match!"
+        cleanupAndExit 5
+    fi
+    
+    # check for root
+    if [ "$(whoami)" != "root" ]; then
+        # not running as root
+        if [ "$DEBUG" -eq 0 ]; then
+            echo "not running as root, exiting"
+            cleanupAndExit 6
+        fi
+    
+        echo "DEBUG enabled, skipping installation"
+        return 0
+    fi
+
+    # install pkg
+    echo "Installing $archiveName to $targetDir"
+    if ! installer -pkg "$archiveName" -tgt "$targetDir" ; then
+        echo "error installing $archiveName"
+        cleanupAndExit 9
+    fi
+}
+
+# main
+
+# extract info from data
+if [ -z "$archiveName" ]; then
+    # when not given use last element of URL
+    archiveName="${downloadURL##*/}"
+fi
+
+if [ -z "$type" ]; then
+    # when not given use extension of archiveName
+    type="${archiveName##*.}"
+fi
+
+if [ -z "$appName" ]; then
+    # when not given derive from archiveName
+    appName="${archiveName%.*}.app"
+fi
+
+if [ -z "$targetDir" ]; then
+    case $type in
+        dmg)
+            targetDir="/Applications"
+            ;;
+        pkg)
+            targetDir="/"
+            ;;
+        *)
+            echo "Cannot handle type $type"
+            cleanupAndExit 99
+            ;;
+    esac
+fi
+
+# create temporary working directory
+tmpDir=$(mktemp -d )
+if [ "$DEBUG" -eq 1 ]; then
+    # for debugging use script dir as working directory
+    tmpDir=$(dirname "$0")
+fi
+
+# change directory to temporary working directory
+echo "Changing directory to $tmpDir"
+if ! cd "$tmpDir"; then
+    echo "error changing directory $tmpDir"
+    #rm -Rf "$tmpDir"
+    cleanupAndExit 1
+fi
+
+# TODO: when user is logged in, and app is running, prompt user to quit app
+
+if [ -f "$archiveName" ] && [ "$DEBUG" -eq 1 ]; then
+    echo "$archiveName exists and DEBUG enabled, skipping download"
+else
+    # download the dmg
+    echo "Downloading $downloadURL to $archiveName"
+    if ! curl --location --fail --silent "$downloadURL" -o "$archiveName"; then
+        echo "error downloading $downloadURL"
+        cleanupAndExit 2
+    fi
+fi
+
+case $type in
+    dmg)
+        installFromDMG
+        ;;
+    pkg)
+        installFromPKG
+        ;;
+    *)
+        echo "Cannot handle type $type"
+        cleanupAndExit 99
+        ;;
+esac
+
 
 # TODO: notify when done