From 7420292fec4ba0b5753de5bdc05c50a1a4ce2cc1 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Thu, 14 May 2020 15:58:13 +0200
Subject: [PATCH 01/30] added some missing labels

---
 Labels.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Labels.txt b/Labels.txt
index 9f7dad1..1ff8ea0 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -20,6 +20,7 @@ handbrake
 iterm2
 malwarebytes
 microsoftautoupdate
+microsoftcompanyportal
 microsoftdefenderatp
 microsoftedgeconsumerstable
 microsoftedgeenterprisestable
@@ -30,7 +31,10 @@ microsoftonedrive
 microsoftonenote
 microsoftoutlook
 microsoftpowerpoint
+microsoftremotedesktop
 microsoftsharepointplugin
+microsoftskypeforbusiness
+microsoftteams
 microsoftword
 netnewswire
 omnifocus3

From 5c0cb98f69ff8f31a209bd0fbe4855b9f0ff5577 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Fri, 15 May 2020 11:51:44 +0200
Subject: [PATCH 02/30] added FAQ to ReadMe

---
 README.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/README.md b/README.md
index 19e344d..e07bde2 100644
--- a/README.md
+++ b/README.md
@@ -283,4 +283,51 @@ Depending on the application or pkg there are a few more variables you can or ne
 - `updateToolRunAsCurrentUser`:
   When this variable is set (any value), `$updateTool` will be run as the current user. Default is unset and 
 
+## Frequently Asked Questions
+
+### What if the latest is already installed?
+
+Short answer: Installomator will re-download and re-install the latest over the existing installation.
+
+Longer answer:
+
+Installomator will try to find a currently installed app and log the version. When Installomator finds an existing app (any version) and the `updateTool` variable is set, then Installomator will _not_ download and install, but run the `updateTool` instead.
+
+However, there is no simple generic method to actually determine the latest version of an application or installer.
+
+We deploy Installomator usually for user initiated installations from Self Service, so re-installs don't really 'hurt' and may be a useful troubleshooting step.
+
+When you want to have automated installations, you should use smart groups based on the app version to limit excessive re-installations.
+
+### Why don't you just use `autopkg install`?
+
+Short answer: `autopkg` is not designed or suited for this kind of workflow
+
+Long answer:
+
+The motivation to not re-invent the wheel and use and existing tool is understandable. However, `autopkg` was not designed with this use case in mind and has a few significant downsides.
+
+First, you would have to deploy and manage autopkg on all the clients. But to do its work, `autopkg` requires recipes. So, you have to install, and update the recipe repos on the client, as well. For security reasons, you _really_ should only run trusted recipes, so you need to install and update your personal recipe overrides as well.
+
+The recipes you use are probably spread across multiple community provided recipe-repos, so we have `autopkg` itself, several recipe-repos, and your overrides that we need to manage, each of which may need to be updated at any time.
+
+The community recipe-repos contain several recipes for different applications. When you add a recipe-repo for an app you want, you will also install all the other recipes from that repo.
+
+The `autopkg install` does _not_ require root or even administrative privileges. _Any_ user (even standard users) on the system can now install any of the random recipes that came with the community repos.
+
+To prevent users installing random apps from the community repos, you can curate your own recipe-repo from the community repos and push that to the clients. At this point, you are managing autopkg, your curated repo, your recipe overrides on the clients and handling the additional work of curating and updating your recipe-repo and the overrides.
+
+In addition, a really savvy user (or a malicious attacker) could build their own recipe and run it using the pre-installed `autopkg` you installed.
+
+And then consider what your CISO department (if you have one) would say about the `autopkgserver` and `autopkginstalld` daemons running on all the clients...
+
+At this point it would be easier to use AutoPkg the way it was intended: on a single admin Mac, and let it upload the pkgs to your management system, which deploys them. Each tool is doing what it is designed for.
+
+Please don't misunderstand this as me saying that AutoPkg is a bad or poorly designed tool. AutoPkg is amazing, powerful, and useful. The [Scripting OS X recipe-repo](https://github.com/autopkg/scriptingosx-recipes) is one of the older repos. AutoPkg is valuable tool to help admins with many apps that cannot be automated with tools like Installomator, and with deployment strategies that require more control.
+
+But it is not suited as a client install automation tool.
+
+### Why don't you just use brew?
+
+Read the explanation for `autopkg`, pretty much the same applies for `brew`, i.e. While it is useful on a single Mac, it is a un-manageable mess when you think about deploying and managing on a fleet of computers.
 

From 563c2e7447823a54f52aef714c580e4fb0e25020 Mon Sep 17 00:00:00 2001
From: Mischa van der Bent <mischa.vanderbent@jamf.com>
Date: Fri, 15 May 2020 12:40:19 +0200
Subject: [PATCH 03/30] Added Apps

icons, autodmg, postman, sublimetext, jamfpppcutility, jamfmigrator, jamfreenroller
---
 Installomator.sh | 49 ++++++++++++++++++++++++++++++++++++++++++++++++
 Labels.txt       |  5 +++++
 identifier       |  0
 3 files changed, 54 insertions(+)
 create mode 100644 identifier

diff --git a/Installomator.sh b/Installomator.sh
index 1b0da37..bacbca3 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -168,6 +168,13 @@ case $label in
         ;;
     
     # label descriptions start here
+     autodmg)
+        # credit: Mischa van der Bent
+        name="AutoDMG"
+        type="dmg"
+        downloadURL=$(downloadURLFromGit MagerValp AutoDMG)
+        expectedTeamID="5KQ3D3FG5H"
+        ;;
     googlechrome)
         name="Google Chrome"
         type="dmg"
@@ -373,6 +380,13 @@ case $label in
         downloadURL=$(downloadURLFromGit sap macOS-enterprise-privileges )
         expectedTeamID="7R5ZEU67FQ"
         ;;
+    icons)
+        # credit: Mischa van der Bent
+        name="Icons"
+        type="zip"
+        downloadURL=$(downloadURLFromGit sap macOS-icon-generator )
+        expectedTeamID="7R5ZEU67FQ"
+        ;;
     googledrivefilestream)
         # credit: Isaac Ordonez, Mann consulting
         name="Google Drive File Stream"
@@ -386,12 +400,47 @@ case $label in
         downloadURL="https://www.fatcatsoftware.com/plisteditpro/PlistEditPro.zip"
         expectedTeamID="8NQ43ND65V"
         ;;    
+    postman)
+        # credit: Mischa van der Bent
+        name="Postman"
+        type="zip"
+        downloadURL="https://dl.pstmn.io/download/latest/osx"
+        expectedTeamID="H7H8Q7M5CK"
+        ;;
+    jamfpppcutility)
+        # credit: Mischa van der Bent
+        name="PPPC Utility"
+        type="zip"
+        downloadURL=$(downloadURLFromGit jamf PPPC-Utility)
+        expectedTeamID="483DWKW443"
+        ;;
+    jamfmigrator)
+        # credit: Mischa van der Bent
+        name="jamf-migrator"
+        type="zip"
+        downloadURL=$(downloadURLFromGit jamf JamfMigrator)
+        expectedTeamID="PS2F6S478M"
+        ;;
+    jamfreenroller)
+        # credit: Mischa van der Bent
+        name="ReEnroller"
+        type="zip"
+        downloadURL=$(downloadURLFromGit jamf ReEnroller)
+        expectedTeamID="PS2F6S478M"
+        ;;
     slack)
         name="Slack"
         type="dmg"
         downloadURL="https://slack.com/ssb/download-osx"
         expectedTeamID="BQR82RBBHL"
         ;;
+    sublimetext)
+        # credit: Mischa van der Bent
+        name="Sublime Text"
+        type="dmg"
+        downloadURL="https://download.sublimetext.com/latest/stable/osx"
+        expectedTeamID="Z6D26JE4Y4"
+        ;;
     githubdesktop)
         name="GitHub Desktop"
         type="zip"
diff --git a/Labels.txt b/Labels.txt
index 1ff8ea0..0727468 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -1,5 +1,6 @@
 1password7
 atom
+autodmg
 aviatrix
 bbedit
 citrixworkspace
@@ -18,6 +19,8 @@ googledrivefilestream
 grandperspective
 handbrake
 iterm2
+jamfmigrator
+jamfreenroller
 malwarebytes
 microsoftautoupdate
 microsoftcompanyportal
@@ -42,6 +45,7 @@ omnigraffle7
 openvpnconnect
 pacifist
 plisteditpro
+postman
 privileges
 resiliosynchome
 royaltsx
@@ -49,6 +53,7 @@ slack
 sonos
 sourcetree
 spotify
+sublimetext
 suspiciouspackage
 teamviewer
 textmate
diff --git a/identifier b/identifier
new file mode 100644
index 0000000..e69de29

From 26487d0d353a914c7f455a011edf323c1ce260b0 Mon Sep 17 00:00:00 2001
From: Mischa van der Bent <mischa.vanderbent@jamf.com>
Date: Fri, 15 May 2020 12:40:32 +0200
Subject: [PATCH 04/30] added apps labels

icons, autodmg, postman, sublimetext, jamfpppcutility, jamfmigrator, jamfreenroller
---
 Labels.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Labels.txt b/Labels.txt
index 0727468..9531279 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -18,7 +18,9 @@ googlechromepkg
 googledrivefilestream
 grandperspective
 handbrake
+icons
 iterm2
+jamfpppcutility
 jamfmigrator
 jamfreenroller
 malwarebytes

From 9dcacfae915f7e9b61e6da421881558376889130 Mon Sep 17 00:00:00 2001
From: kenchan0130 <tt.tanishi100@gmail.com>
Date: Fri, 15 May 2020 19:54:27 +0900
Subject: [PATCH 05/30] apply fmt

---
 Installomator.sh | 78 ++++++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/Installomator.sh b/Installomator.sh
index 1b0da37..48b08cc 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -45,7 +45,7 @@ BLOCKING_PROCESS_ACTION=prompt_user
 #     - zip
 #     - pkgInDmg
 #     - pkgInZip (not yet tested)
-# 
+#
 # - downloadURL: (required)
 #   URL to download the dmg.
 #   Can be generated with a series of commands (see BBEdit for an example).
@@ -61,7 +61,7 @@ BLOCKING_PROCESS_ACTION=prompt_user
 #     spctl -a -vv -t install ~/Downloads/desktoppr-0.2.pkg
 #
 #   The team ID is the ten-digit ID at the end of the line starting with 'origin='
-# 
+#
 # - archiveName: (optional)
 #   The name of the downloaded file.
 #   When not given the archiveName is derived from the $name.
@@ -74,7 +74,7 @@ BLOCKING_PROCESS_ACTION=prompt_user
 #   dmg or zip:
 #     Applications will be copied to this directory.
 #     Default value is '/Applications' for dmg and zip installations.
-#   pkg: 
+#   pkg:
 #     targetDir is used as the install-location. Default is '/'.
 #
 # - blockingProcesses: (optional)
@@ -85,7 +85,7 @@ BLOCKING_PROCESS_ACTION=prompt_user
 #     blockingProcesses=( "Keynote" "Pages" "Numbers" )
 #   When a workflow has no blocking processes, use
 #     blockingProcesses=( NONE )
-# 
+#
 # - pkgName: (optional, only used for dmgInPkg and dmgInZip)
 #   File name of the pkg file _inside_ the dmg or zip
 #   When not given the pkgName is derived from the $name
@@ -118,7 +118,7 @@ BLOCKING_PROCESS_ACTION=prompt_user
 downloadURLFromGit() { # $1 git user name, $2 git repo name
     gitusername=${1?:"no git user name"}
     gitreponame=${2?:"no git repo name"}
-    
+
     if [ -n "$archiveName" ]; then
     downloadURL=$(curl --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" \
     | awk -F '"' "/browser_download_url/ && /$archiveName/ { print \$4 }")
@@ -166,7 +166,7 @@ case $label in
         echo "Installomater: version $VERSION ($VERSIONDATE)"
         exit 0
         ;;
-    
+
     # label descriptions start here
     googlechrome)
         name="Google Chrome"
@@ -289,7 +289,7 @@ case $label in
             | cut -d '"' -f 2 )
         expectedTeamID="UPXU4CQZ5P"
         ;;
-    boxdrive) 
+    boxdrive)
         # credit: Isaac Ordonez, Mann consulting
         name="Box"
         type="pkg"
@@ -308,7 +308,7 @@ case $label in
         name="Zoom.us"
         type="pkg"
         downloadURL="https://zoom.us/client/latest/ZoomInstallerIT.pkg"
-        expectedTeamID="BJ4HAAB9B3"        
+        expectedTeamID="BJ4HAAB9B3"
         blockingProcesses=( zoom.us )
         ;;
     sonos)
@@ -385,7 +385,7 @@ case $label in
         type="zip"
         downloadURL="https://www.fatcatsoftware.com/plisteditpro/PlistEditPro.zip"
         expectedTeamID="8NQ43ND65V"
-        ;;    
+        ;;
     slack)
         name="Slack"
         type="dmg"
@@ -467,7 +467,7 @@ case $label in
         downloadURL=$(curl -fs https://royaltsx-v4.royalapps.com/updates_stable | xpath '//rss/channel/item[1]/enclosure/@url'  2>/dev/null | cut -d '"' -f 2)
         expectedTeamID="VXP8K9EDP6"
         ;;
-        
+
 
 #    Note: Packages is signed but _not_ notarized, so spctl will reject it
 #    packages)
@@ -482,7 +482,7 @@ case $label in
     # https://docs.microsoft.com/en-us/deployoffice/mac/update-office-for-mac-using-msupdate
 
     # download link IDs from: https://macadmin.software
-    
+
     microsoftoffice365)
         name="MicrosoftOffice365"
         type="pkg"
@@ -493,7 +493,7 @@ case $label in
         blockingProcesses=( "Microsoft AutoUpdate" "Microsoft Word" "Microsoft PowerPoint" "Microsoft Excel" "Microsoft OneNote" "Microsoft Outlook" "OneDrive" )
         updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
         updateToolArguments=( --install )
-        ;;   
+        ;;
     microsoftofficebusinesspro)
         name="MicrosoftOfficeBusinessPro"
         type="pkg"
@@ -504,7 +504,7 @@ case $label in
         blockingProcesses=( "Microsoft AutoUpdate" "Microsoft Word" "Microsoft PowerPoint" "Microsoft Excel" "Microsoft OneNote" "Microsoft Outlook" "OneDrive" "Teams")
         updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
         updateToolArguments=( --install )
-        ;;   
+        ;;
     microsoftedgeconsumerstable)
         name="Microsoft Edge"
         type="pkg"
@@ -513,7 +513,7 @@ case $label in
         updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
         updateToolArguments=( --install --apps EDGE01 )
         ;;
-    microsoftcompanyportal)  
+    microsoftcompanyportal)
         name="Company Portal"
         type="pkg"
         downloadURL="https://go.microsoft.com/fwlink/?linkid=869655"
@@ -521,7 +521,7 @@ case $label in
         updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
         updateToolArguments=( --install --apps IMCP01 )
         ;;
-    microsoftskypeforbusiness)  
+    microsoftskypeforbusiness)
         name="Skype for Business"
         type="pkg"
         downloadURL="https://go.microsoft.com/fwlink/?linkid=832978"
@@ -529,7 +529,7 @@ case $label in
         updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
         updateToolArguments=( --install --apps MSFB16 )
         ;;
-    microsoftremotedesktop)  
+    microsoftremotedesktop)
         name="Microsoft Remote Desktop"
         type="pkg"
         downloadURL="https://go.microsoft.com/fwlink/?linkid=868963"
@@ -537,7 +537,7 @@ case $label in
         updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
         updateToolArguments=( --install --apps MSRD10 )
         ;;
-    microsoftteams)  
+    microsoftteams)
         name="Microsoft Teams"
         type="pkg"
         downloadURL="https://go.microsoft.com/fwlink/?linkid=869428"
@@ -637,7 +637,7 @@ case $label in
         ;;
 
 
-    
+
     # these descriptions exist for testing and are intentionally broken
     brokendownloadurl)
         name="Google Chrome"
@@ -674,7 +674,7 @@ cleanupAndExit() { # $1 = exit code, $2 message
         echo "Deleting $tmpDir"
         rm -Rf "$tmpDir"
     fi
-    
+
     if [ -n "$dmgmount" ]; then
         # unmount disk image
         echo "Unmounting $dmgmount"
@@ -683,7 +683,7 @@ cleanupAndExit() { # $1 = exit code, $2 message
     exit "$1"
 }
 
-runAsUser() {  
+runAsUser() {
     if [[ $currentUser != "loginwindow" ]]; then
         uid=$(id -u "$currentUser")
         launchctl asuser $uid sudo -u $currentUser "$@"
@@ -699,7 +699,7 @@ displaynotification() { # $1: message $2: title
     message=${1:-"Message"}
     title=${2:-"Notification"}
     manageaction="/Library/Application Support/JAMF/bin/Management Action.app/Contents/MacOS/Management Action"
-    
+
     if [[ -x "$manageaction" ]]; then
          "$manageaction" -message "$message" -title "$title"
     else
@@ -733,14 +733,14 @@ checkRunningProcesses() {
         echo "DEBUG mode, not checking for blocking processes"
         return
     fi
-    
+
     # try at most 3 times
     for i in {1..3}; do
         countedProcesses=0
         for x in ${blockingProcesses}; do
             if pgrep -xq "$x"; then
                 echo "found blocking process $x"
-                
+
                 case $BLOCKING_PROCESS_ACTION in
                     kill)
                       echo "killing process $x"
@@ -758,7 +758,7 @@ checkRunningProcesses() {
                       cleanupAndExit 12 "blocking process '$x' found, aborting"
                       ;;
                 esac
-                
+
                 countedProcesses=$((countedProcesses + 1))
             fi
         done
@@ -782,7 +782,7 @@ checkRunningProcesses() {
 
 installAppWithPath() { # $1: path to app to install in $targetDir
     appPath=${1?:"no path to app"}
-    
+
     # check if app exists
     if [ ! -e "$appPath" ]; then
         cleanupAndExit 8 "could not find: $appPath"
@@ -806,7 +806,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir
         if [ "$DEBUG" -eq 0 ]; then
             cleanupAndExit 6 "not running as root, exiting"
         fi
-    
+
         echo "DEBUG enabled, skipping copy and chown steps"
         return 0
     fi
@@ -827,7 +827,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir
     # set ownership to current user
     if [ "$currentUser" != "loginwindow" ]; then
         echo "Changing owner to $currentUser"
-        chown -R "$currentUser" "$targetDir/$appName" 
+        chown -R "$currentUser" "$targetDir/$appName"
     else
         echo "No user logged in, not changing user"
     fi
@@ -841,18 +841,18 @@ mountDMG() {
     if ! dmgmount=$(echo 'Y'$'\n' | hdiutil attach "$tmpDir/$archiveName" -nobrowse -readonly | tail -n 1 | cut -c 54- ); then
         cleanupAndExit 3 "Error mounting $tmpDir/$archiveName"
     fi
-    
+
     if [[ ! -e $dmgmount ]]; then
         echo "Error mounting $tmpDir/$archiveName"
         cleanupAndExit 3
     fi
-    
+
     echo "Mounted: $dmgmount"
 }
 
 installFromDMG() {
     mountDMG
-    
+
     installAppWithPath "$dmgmount/$appName"
 }
 
@@ -870,18 +870,18 @@ installFromPKG() {
         echo "Team IDs do not match!"
         cleanupAndExit 5
     fi
-    
+
     # skip install for DEBUG
     if [ "$DEBUG" -ne 0 ]; then
         echo "DEBUG enabled, skipping installation"
         return 0
     fi
-    
+
     # check for root
     if [ "$(whoami)" != "root" ]; then
         # not running as root
         echo "not running as root, exiting"
-        cleanupAndExit 6    
+        cleanupAndExit 6
     fi
 
     # install pkg
@@ -896,7 +896,7 @@ installFromZIP() {
     # unzip the archive
     echo "Unzipping $archiveName"
     tar -xf "$archiveName"
-    
+
     installAppWithPath "$tmpDir/$appName"
 }
 
@@ -906,10 +906,10 @@ installPkgInDmg() {
     if [[ -z $pkgName ]]; then
         pkgName="$name.pkg"
     fi
-    
+
     # it is now safe to overwrite archiveName for installFromPKG
     archiveName="$dmgmount/$pkgName"
-    
+
     # installFromPkgs
     installFromPKG
 }
@@ -923,10 +923,10 @@ installPkgInZip() {
     if [[ -z $pkgName ]]; then
         pkgName="$name.pkg"
     fi
-    
+
     # it is now safe to overwrite archiveName for installFromPKG
     archiveName="$tmpDir/$pkgName"
-    
+
     # installFromPkgs
     installFromPKG
 }
@@ -1026,7 +1026,7 @@ if [[ -n $appVersion ]]; then
     else
         echo "DEBUG mode enabled, not running update tool"
     fi
-fi 
+fi
 
 # when user is logged in, and app is running, prompt user to quit app
 

From 6c3466e983556888151a4e885e0f3fff6e8a75c8 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Fri, 15 May 2020 15:26:51 +0200
Subject: [PATCH 06/30] few more fixes in ReadMe

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e07bde2..0329188 100644
--- a/README.md
+++ b/README.md
@@ -285,19 +285,19 @@ Depending on the application or pkg there are a few more variables you can or ne
 
 ## Frequently Asked Questions
 
-### What if the latest is already installed?
+### What if the latest version of the app is already installed?
 
 Short answer: Installomator will re-download and re-install the latest over the existing installation.
 
 Longer answer:
 
-Installomator will try to find a currently installed app and log the version. When Installomator finds an existing app (any version) and the `updateTool` variable is set, then Installomator will _not_ download and install, but run the `updateTool` instead.
+Installomator will try to find a currently installed app to log the version. When Installomator finds an existing app (any version) and the `updateTool` variable is set, then Installomator will _not_ download and install, but run the `updateTool` instead.
 
 However, there is no simple generic method to actually determine the latest version of an application or installer.
 
 We deploy Installomator usually for user initiated installations from Self Service, so re-installs don't really 'hurt' and may be a useful troubleshooting step.
 
-When you want to have automated installations, you should use smart groups based on the app version to limit excessive re-installations.
+When you want to have automated installations, you can use smart groups based on the app version to limit excessive re-installations.
 
 ### Why don't you just use `autopkg install`?
 

From 6f0029da7a12357506ad6f0c8c79422f69298954 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Fri, 15 May 2020 15:27:50 +0200
Subject: [PATCH 07/30] updated version

---
 Installomator.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Installomator.sh b/Installomator.sh
index 1b0da37..e4a15c2 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -8,8 +8,8 @@
 # inspired by the download scripts from William Smith and Sander Schram
 # with additional ideas and contribution from Isaac Ordonez, Mann consulting
 
-VERSION='0.1'
-VERSIONDATE='20200512'
+VERSION='0.2'
+VERSIONDATE='20200515'
 
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 

From 8ec2179c1c68b179e080fa12197db1e5f4cf4b44 Mon Sep 17 00:00:00 2001
From: kenchan0130 <tt.tanishi100@gmail.com>
Date: Mon, 18 May 2020 10:44:51 +0900
Subject: [PATCH 08/30] Add a label of powershell

---
 Installomator.sh | 7 ++++++-
 Labels.txt       | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Installomator.sh b/Installomator.sh
index 48b08cc..d423bb6 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -635,7 +635,12 @@ case $label in
         updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
         updateToolArguments=( --install --apps WDAV00 )
         ;;
-
+    powershell)
+        name="PowerShell"
+        type="pkg"
+        downloadURL=$(downloadURLFromGit PowerShell PowerShell | grep lts)
+        expectedTeamID="UBF8T346G9"
+        ;;
 
 
     # these descriptions exist for testing and are intentionally broken
diff --git a/Labels.txt b/Labels.txt
index 1ff8ea0..4520ce3 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -42,6 +42,7 @@ omnigraffle7
 openvpnconnect
 pacifist
 plisteditpro
+powershell
 privileges
 resiliosynchome
 royaltsx

From 65c33585fa35a923b6ca8dacdae2582dff3d88fe Mon Sep 17 00:00:00 2001
From: kenchan0130 <tt.tanishi100@gmail.com>
Date: Mon, 18 May 2020 14:59:05 +0900
Subject: [PATCH 09/30] Add a label of santa

---
 Installomator.sh | 6 ++++++
 Labels.txt       | 1 +
 2 files changed, 7 insertions(+)

diff --git a/Installomator.sh b/Installomator.sh
index 1b0da37..1d2cb99 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -183,6 +183,12 @@ case $label in
         updateToolArguments=( -runMode oneshot -userInitiated YES )
         updateToolRunAsCurrentUser=1
         ;;
+    santa)
+        name="Santa"
+        type="pkgInDmg"
+        downloadURL=$(downloadURLFromGit google santa)
+        expectedTeamID="EQHXZ8M8AV"
+        ;;
     spotify)
         name="Spotify"
         type="dmg"
diff --git a/Labels.txt b/Labels.txt
index 1ff8ea0..7066756 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -45,6 +45,7 @@ plisteditpro
 privileges
 resiliosynchome
 royaltsx
+santa
 slack
 sonos
 sourcetree

From b6c18b44389e0947a2319ac68fdff274238d97a9 Mon Sep 17 00:00:00 2001
From: kenchan0130 <tt.tanishi100@gmail.com>
Date: Mon, 18 May 2020 15:18:58 +0900
Subject: [PATCH 10/30] Add a label of Google Japanese Input

---
 Installomator.sh | 6 ++++++
 Labels.txt       | 1 +
 2 files changed, 7 insertions(+)

diff --git a/Installomator.sh b/Installomator.sh
index 1b0da37..9e48344 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -183,6 +183,12 @@ case $label in
         updateToolArguments=( -runMode oneshot -userInitiated YES )
         updateToolRunAsCurrentUser=1
         ;;
+    googlejapaneseinput)
+        name="Google Japanese Input"
+        type="pkgInDmg"
+        downloadURL="https://dl.google.com/japanese-ime/latest/GoogleJapaneseInput.dmg"
+        expectedTeamID="EQHXZ8M8AV"
+        ;;
     spotify)
         name="Spotify"
         type="dmg"
diff --git a/Labels.txt b/Labels.txt
index 1ff8ea0..0182f7d 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -14,6 +14,7 @@ firefox
 githubdesktop
 googlechrome
 googlechromepkg
+googlejapaneseinput
 googledrivefilestream
 grandperspective
 handbrake

From f01a50e4289883919052ee2eb157c5a3637a8b48 Mon Sep 17 00:00:00 2001
From: kenchan0130 <tt.tanishi100@gmail.com>
Date: Mon, 18 May 2020 15:39:14 +0900
Subject: [PATCH 11/30] Add a label of Roaming Client

---
 Installomator.sh | 6 +++++-
 Labels.txt       | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Installomator.sh b/Installomator.sh
index 1b0da37..c79edcf 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -467,7 +467,11 @@ case $label in
         downloadURL=$(curl -fs https://royaltsx-v4.royalapps.com/updates_stable | xpath '//rss/channel/item[1]/enclosure/@url'  2>/dev/null | cut -d '"' -f 2)
         expectedTeamID="VXP8K9EDP6"
         ;;
-        
+    roamingclient)
+        name="Roaming Client"
+        type="pkgInZip"
+        downloadURL="http://shared.opendns.com/roaming/enterprise/release/mac/production/RoamingClient_MAC.mpkg.zip"
+        expectedTeamID="7P7HQ8H646"
 
 #    Note: Packages is signed but _not_ notarized, so spctl will reject it
 #    packages)
diff --git a/Labels.txt b/Labels.txt
index 1ff8ea0..4fb3320 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -44,6 +44,7 @@ pacifist
 plisteditpro
 privileges
 resiliosynchome
+roamingclient
 royaltsx
 slack
 sonos

From e5a19562583510bc4a0e0a11b9863ed902bfa2a3 Mon Sep 17 00:00:00 2001
From: kenchan0130 <tt.tanishi100@gmail.com>
Date: Mon, 18 May 2020 16:05:33 +0900
Subject: [PATCH 12/30] Add a label of AppCleaner

---
 Installomator.sh | 7 ++++++-
 Labels.txt       | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Installomator.sh b/Installomator.sh
index 1b0da37..2b1f8bf 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -467,7 +467,12 @@ case $label in
         downloadURL=$(curl -fs https://royaltsx-v4.royalapps.com/updates_stable | xpath '//rss/channel/item[1]/enclosure/@url'  2>/dev/null | cut -d '"' -f 2)
         expectedTeamID="VXP8K9EDP6"
         ;;
-        
+    appclener)
+        name="AppCleaner"
+        type="zip"
+        downloadURL=$(curl -fs https://freemacsoft.net/appcleaner/Updates.xml | xpath '//rss/channel/*/enclosure/@url' 2>/dev/null | tr " " "\n" | sort | tail -1 | cut -d '"' -f 2)
+        expectedTeamID="X85ZX835W9"
+        ;;
 
 #    Note: Packages is signed but _not_ notarized, so spctl will reject it
 #    packages)
diff --git a/Labels.txt b/Labels.txt
index 1ff8ea0..b11f23f 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -1,4 +1,5 @@
 1password7
+appclener
 atom
 aviatrix
 bbedit

From 260ad87d4c90d15f1d04c8366966931a4d482e71 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Mon, 18 May 2020 09:33:29 +0200
Subject: [PATCH 13/30] added credit

---
 Installomator.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Installomator.sh b/Installomator.sh
index 8a20014..8995f63 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -657,6 +657,7 @@ case $label in
         updateToolArguments=( --install --apps WDAV00 )
         ;;
     powershell)
+        # credit: Tadayuki Onishi (@kenchan0130)
         name="PowerShell"
         type="pkg"
         downloadURL=$(downloadURLFromGit PowerShell PowerShell | grep lts)

From 14a397d23b59783219ae158431284dd47c80fca6 Mon Sep 17 00:00:00 2001
From: kenchan0130 <tt.tanishi100@gmail.com>
Date: Mon, 18 May 2020 16:55:50 +0900
Subject: [PATCH 14/30] Add a label of Karabiner-Elements

---
 Installomator.sh | 7 ++++++-
 Labels.txt       | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Installomator.sh b/Installomator.sh
index 1b0da37..58b327f 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -467,7 +467,12 @@ case $label in
         downloadURL=$(curl -fs https://royaltsx-v4.royalapps.com/updates_stable | xpath '//rss/channel/item[1]/enclosure/@url'  2>/dev/null | cut -d '"' -f 2)
         expectedTeamID="VXP8K9EDP6"
         ;;
-        
+    karabinerelements)
+        name="Karabiner-Elements"
+        type="pkgInDmg"
+        downloadURL=$(downloadURLFromGit pqrs-org Karabiner-Elements)
+        expectedTeamID="G43BCU2T37"
+        ;;
 
 #    Note: Packages is signed but _not_ notarized, so spctl will reject it
 #    packages)
diff --git a/Labels.txt b/Labels.txt
index 1ff8ea0..3749ac6 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -18,6 +18,7 @@ googledrivefilestream
 grandperspective
 handbrake
 iterm2
+karabinerelements
 malwarebytes
 microsoftautoupdate
 microsoftcompanyportal

From 432e8e83e22133a8a94ff36fb24a97daffa8683c Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Mon, 18 May 2020 10:02:21 +0200
Subject: [PATCH 15/30] updated credits

---
 Installomator.sh | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)
 mode change 100755 => 100644 Installomator.sh

diff --git a/Installomator.sh b/Installomator.sh
old mode 100755
new mode 100644
index e6ea0e9..f7dca6c
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -9,7 +9,7 @@
 # with additional ideas and contribution from Isaac Ordonez, Mann consulting
 
 VERSION='0.2'
-VERSIONDATE='20200515'
+VERSIONDATE='20200518'
 
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
@@ -169,7 +169,7 @@ case $label in
 
     # label descriptions start here
      autodmg)
-        # credit: Mischa van der Bent
+        # credit: Mischa van der Bent (@mischavdbent)
         name="AutoDMG"
         type="dmg"
         downloadURL=$(downloadURLFromGit MagerValp AutoDMG)
@@ -191,12 +191,14 @@ case $label in
         updateToolRunAsCurrentUser=1
         ;;
     googlejapaneseinput)
+        # credit: Tadayuki Onishi (@kenchan0130)
         name="Google Japanese Input"
         type="pkgInDmg"
         downloadURL="https://dl.google.com/japanese-ime/latest/GoogleJapaneseInput.dmg"
         expectedTeamID="EQHXZ8M8AV"
         ;;
     santa)
+        # credit: Tadayuki Onishi (@kenchan0130)
         name="Santa"
         type="pkgInDmg"
         downloadURL=$(downloadURLFromGit google santa)
@@ -241,7 +243,7 @@ case $label in
         expectedTeamID="GVZRY6KDKR"
         ;;
     suspiciouspackage)
-        # credit: Mischa van der Bent
+        # credit: Mischa van der Bent (@mischavdbent)
         name="Suspicious Package"
         type="dmg"
         downloadURL="https://mothersruin.com/software/downloads/SuspiciousPackage.dmg"
@@ -309,21 +311,21 @@ case $label in
         expectedTeamID="UPXU4CQZ5P"
         ;;
     boxdrive)
-        # credit: Isaac Ordonez, Mann consulting
+        # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
         name="Box"
         type="pkg"
         downloadURL="https://e3.boxcdn.net/box-installers/desktop/releases/mac/Box.pkg"
         expectedTeamID="M683GB7CPW"
         ;;
     aviatrix)
-        # credit: Isaac Ordonez, Mann consulting
+        # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
         name="Aviatrix VPN Client"
         type="pkg"
         downloadURL="https://s3-us-west-2.amazonaws.com/aviatrix-download/AviatrixVPNClient/AVPNC_mac.pkg"
         expectedTeamID="32953Z7NBN"
         ;;
     zoom)
-        # credit: Isaac Ordonez, Mann consulting
+        # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
         name="Zoom.us"
         type="pkg"
         downloadURL="https://zoom.us/client/latest/ZoomInstallerIT.pkg"
@@ -331,21 +333,21 @@ case $label in
         blockingProcesses=( zoom.us )
         ;;
     sonos)
-        # credit: Erik Stam
+        # credit: Erik Stam (@erikstam)
         name="Sonos"
         type="dmg"
         downloadURL="https://www.sonos.com/redir/controller_software_mac"
         expectedTeamID="2G4LW83Q3E"
         ;;
     coderunner)
-        # credit: Erik Stam
+        # credit: Erik Stam (@erikstam)
         name="CodeRunner"
         type="zip"
         downloadURL="https://coderunnerapp.com/download"
         expectedTeamID="R4GD98AJF9"
         ;;
     openvpnconnect)
-        # credit: Erik Stam
+        # credit: Erik Stam (@erikstam)
         name="OpenVPN"
         type="pkgInDmg"
         pkgName="OpenVPN_Connect_Installer_signed.pkg"
@@ -365,42 +367,42 @@ case $label in
         expectedTeamID="2BUA8C4S2C"
         ;;
     webexmeetings)
-        # credit: Erik Stam
+        # credit: Erik Stam (@erikstam)
         name="Cisco Webex Meetings"
         type="pkgInDmg"
         downloadURL="https://akamaicdn.webex.com/client/webexapp.dmg"
         expectedTeamID="DE8Y96K9QP"
         ;;
     webexteams)
-        # credit: Erik Stam
+        # credit: Erik Stam (@erikstam)
         name="Webex Teams"
         type="pkgInDmg"
         downloadURL="https://binaries.webex.com/WebexTeamsDesktop-MACOS-Gold/WebexTeams.dmg"
         expectedTeamID="DE8Y96K9QP"
         ;;
     citrixworkspace)
-        # credit: Erik Stam
+        # credit: Erik Stam (@erikstam)
         name="Citrix Workspace"
         type="pkgInDmg"
         downloadURL="https://downloads.citrix.com/17596/CitrixWorkspaceApp.dmg?__gda__=1588183500_fc68033aef7d6d163d8b8309b964f1de"
         expectedTeamID="S272Y5R93J"
         ;;
     privileges)
-        # credit: Erik Stam
+        # credit: Erik Stam (@erikstam)
         name="Privileges"
         type="zip"
         downloadURL=$(downloadURLFromGit sap macOS-enterprise-privileges )
         expectedTeamID="7R5ZEU67FQ"
         ;;
     icons)
-        # credit: Mischa van der Bent
+        # credit: Mischa van der Bent (@mischavdbent)
         name="Icons"
         type="zip"
         downloadURL=$(downloadURLFromGit sap macOS-icon-generator )
         expectedTeamID="7R5ZEU67FQ"
         ;;
     googledrivefilestream)
-        # credit: Isaac Ordonez, Mann consulting
+        # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
         name="Google Drive File Stream"
         type="pkgInDmg"
         downloadURL="https://dl.google.com/drive-file-stream/GoogleDriveFileStream.dmg"
@@ -419,7 +421,7 @@ case $label in
         expectedTeamID="BQR82RBBHL"
         ;;
     sublimetext)
-        # credit: Mischa van der Bent
+        # credit: Mischa van der Bent (@mischavdbent)
         name="Sublime Text"
         type="dmg"
         downloadURL="https://download.sublimetext.com/latest/stable/osx"
@@ -501,18 +503,22 @@ case $label in
         expectedTeamID="VXP8K9EDP6"
         ;;
     roamingclient)
+        # credit: Tadayuki Onishi (@kenchan0130)
         name="Roaming Client"
         type="pkgInZip"
         downloadURL="http://shared.opendns.com/roaming/enterprise/release/mac/production/RoamingClient_MAC.mpkg.zip"
         expectedTeamID="7P7HQ8H646"
         ;;
     appcleaner)
+        # credit: Tadayuki Onishi (@kenchan0130)
         name="AppCleaner"
         type="zip"
         downloadURL=$(curl -fs https://freemacsoft.net/appcleaner/Updates.xml | xpath '//rss/channel/*/enclosure/@url' 2>/dev/null | tr " " "\n" | sort | tail -1 | cut -d '"' -f 2)
         expectedTeamID="X85ZX835W9"
         ;;
 
+
+
 #    Note: Packages is signed but _not_ notarized, so spctl will reject it
 #    packages)
 #        name="Packages"

From a6344a490fb15422c7b1a40e80bf7ca1bbb7cc78 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Mon, 18 May 2020 10:08:53 +0200
Subject: [PATCH 16/30] fixed executable bit again

---
 Installomator.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 Installomator.sh

diff --git a/Installomator.sh b/Installomator.sh
old mode 100644
new mode 100755

From 6a55709f400a4d9bd489a0a187d14964f3246dc5 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Mon, 18 May 2020 10:44:42 +0200
Subject: [PATCH 17/30] installPkgInDmg now searches for the first pkg in the
 dmg

---
 Installomator.sh | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/Installomator.sh b/Installomator.sh
index 68a7653..d0b64bd 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -118,16 +118,25 @@ BLOCKING_PROCESS_ACTION=prompt_user
 downloadURLFromGit() { # $1 git user name, $2 git repo name
     gitusername=${1?:"no git user name"}
     gitreponame=${2?:"no git repo name"}
-
+    
+    if [[ $type == "pkgInDmg" ]]; then
+        filetype="dmg"
+    elif [[ $type == "pkgInZip" ]]; then
+        filetype="zip"
+    else
+        filetype=$type
+    fi
+    
     if [ -n "$archiveName" ]; then
     downloadURL=$(curl --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" \
     | awk -F '"' "/browser_download_url/ && /$archiveName/ { print \$4 }")
     else
     downloadURL=$(curl --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" \
-    | awk -F '"' "/browser_download_url/ && /$type/ { print \$4 }")
+    | awk -F '"' "/browser_download_url/ && /$filetype/ { print \$4 }")
     fi
     if [ -z "$downloadURL" ]; then
-        cleanupAndExit 9 "could not retrieve download URL for $gitusername/$gitreponame"
+        echo "could not retrieve download URL for $gitusername/$gitreponame"
+        exit 9
     else
         echo "$downloadURL"
         return 0
@@ -967,12 +976,21 @@ installPkgInDmg() {
     mountDMG
     # locate pkg in dmg
     if [[ -z $pkgName ]]; then
-        pkgName="$name.pkg"
+        # find a file starting with $name and ending with 'pkg'
+        findfiles=$(find -X "$dmgmount" -iname "${name}*.pkg" -maxdepth 1  )
+        echo $findfiles
+        filearray=( ${(0)findfiles} )
+        echo $filearray  ${#filearray}
+        if [[ ${#filearray} -eq 0 ]]; then
+            cleanupAndExit 20 "couldn't find pkg in dmg $archiveName"
+        fi
+        archiveName="${filearray[1]}"
+        echo "found pkg: $archiveName"
+    else
+        # it is now safe to overwrite archiveName for installFromPKG
+        archiveName="$dmgmount/$pkgName"
     fi
 
-    # it is now safe to overwrite archiveName for installFromPKG
-    archiveName="$dmgmount/$pkgName"
-
     # installFromPkgs
     installFromPKG
 }

From b32e143dc0d5f7282bf16fdaf9a01037d044f4b8 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Mon, 18 May 2020 10:56:58 +0200
Subject: [PATCH 18/30] installPkgInZip now finds first pkg in zip

---
 Installomator.sh | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Installomator.sh b/Installomator.sh
index d0b64bd..7f52613 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -201,8 +201,9 @@ case $label in
         ;;
     googlejapaneseinput)
         # credit: Tadayuki Onishi (@kenchan0130)
-        name="Google Japanese Input"
+        name="GoogleJapaneseInput"
         type="pkgInDmg"
+        pkgName="GoogleJapaneseInput.pkg"
         downloadURL="https://dl.google.com/japanese-ime/latest/GoogleJapaneseInput.dmg"
         expectedTeamID="EQHXZ8M8AV"
         ;;
@@ -513,7 +514,7 @@ case $label in
         ;;
     roamingclient)
         # credit: Tadayuki Onishi (@kenchan0130)
-        name="Roaming Client"
+        name="RoamingClient"
         type="pkgInZip"
         downloadURL="http://shared.opendns.com/roaming/enterprise/release/mac/production/RoamingClient_MAC.mpkg.zip"
         expectedTeamID="7P7HQ8H646"
@@ -978,9 +979,7 @@ installPkgInDmg() {
     if [[ -z $pkgName ]]; then
         # find a file starting with $name and ending with 'pkg'
         findfiles=$(find -X "$dmgmount" -iname "${name}*.pkg" -maxdepth 1  )
-        echo $findfiles
         filearray=( ${(0)findfiles} )
-        echo $filearray  ${#filearray}
         if [[ ${#filearray} -eq 0 ]]; then
             cleanupAndExit 20 "couldn't find pkg in dmg $archiveName"
         fi
@@ -1002,12 +1001,20 @@ installPkgInZip() {
 
     # locate pkg in zip
     if [[ -z $pkgName ]]; then
-        pkgName="$name.pkg"
+        # find a file starting with $name and ending with 'pkg'
+        findfiles=$(find -X "$tmpDir" -iname "${name}*.pkg" -maxdepth 1  )
+        filearray=( ${(0)findfiles} )
+        if [[ ${#filearray} -eq 0 ]]; then
+            cleanupAndExit 20 "couldn't find pkg in zip $archiveName"
+        fi
+        archiveName="${filearray[1]}"
+        # it is now safe to overwrite archiveName for installFromPKG
+        echo "found pkg: $archiveName"
+    else
+        # it is now safe to overwrite archiveName for installFromPKG
+        archiveName="$tmpDir/$pkgName"
     fi
 
-    # it is now safe to overwrite archiveName for installFromPKG
-    archiveName="$tmpDir/$pkgName"
-
     # installFromPkgs
     installFromPKG
 }

From e99af92196415d8c056578600f38cce89b450ec0 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Mon, 18 May 2020 11:38:21 +0200
Subject: [PATCH 19/30] removed roamingclient and powershell after testing
 failed

---
 Installomator.sh | 16 +---------------
 Labels.txt       |  2 --
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/Installomator.sh b/Installomator.sh
index 7f52613..100ab47 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -512,14 +512,7 @@ case $label in
         downloadURL=$(curl -fs https://royaltsx-v4.royalapps.com/updates_stable | xpath '//rss/channel/item[1]/enclosure/@url'  2>/dev/null | cut -d '"' -f 2)
         expectedTeamID="VXP8K9EDP6"
         ;;
-    roamingclient)
-        # credit: Tadayuki Onishi (@kenchan0130)
-        name="RoamingClient"
-        type="pkgInZip"
-        downloadURL="http://shared.opendns.com/roaming/enterprise/release/mac/production/RoamingClient_MAC.mpkg.zip"
-        expectedTeamID="7P7HQ8H646"
-        ;;
-    appcleaner)
+s    appcleaner)
         # credit: Tadayuki Onishi (@kenchan0130)
         name="AppCleaner"
         type="zip"
@@ -702,13 +695,6 @@ case $label in
         updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
         updateToolArguments=( --install --apps WDAV00 )
         ;;
-    powershell)
-        # credit: Tadayuki Onishi (@kenchan0130)
-        name="PowerShell"
-        type="pkg"
-        downloadURL=$(downloadURLFromGit PowerShell PowerShell | grep lts)
-        expectedTeamID="UBF8T346G9"
-        ;;
 
 
     # these descriptions exist for testing and are intentionally broken
diff --git a/Labels.txt b/Labels.txt
index 0ac68c0..dc2bde0 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -50,11 +50,9 @@ omnigraffle7
 openvpnconnect
 pacifist
 plisteditpro
-powershell
 postman
 privileges
 resiliosynchome
-roamingclient
 royaltsx
 santa
 slack

From d45af386360a4afc273a1e5087bdeb50e3cc4210 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Mon, 18 May 2020 11:43:35 +0200
Subject: [PATCH 20/30] re-added postman, jamfpppcutility, jamfmigrator,
 jamfreenroller

---
 Installomator.sh | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/Installomator.sh b/Installomator.sh
index 100ab47..11c90d8 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -526,6 +526,34 @@ s    appcleaner)
         downloadURL=$(downloadURLFromGit pqrs-org Karabiner-Elements)
         expectedTeamID="G43BCU2T37"
         ;;
+    postman)
+        # credit: Mischa van der Bent
+        name="Postman"
+        type="zip"
+        downloadURL="https://dl.pstmn.io/download/latest/osx"
+        expectedTeamID="H7H8Q7M5CK"
+        ;;
+    jamfpppcutility)
+        # credit: Mischa van der Bent
+        name="PPPC Utility"
+        type="zip"
+        downloadURL=$(downloadURLFromGit jamf PPPC-Utility)
+        expectedTeamID="483DWKW443"
+        ;;
+    jamfmigrator)
+        # credit: Mischa van der Bent
+        name="jamf-migrator"
+        type="zip"
+        downloadURL=$(downloadURLFromGit jamf JamfMigrator)
+        expectedTeamID="PS2F6S478M"
+        ;;
+    jamfreenroller)
+        # credit: Mischa van der Bent
+        name="ReEnroller"
+        type="zip"
+        downloadURL=$(downloadURLFromGit jamf ReEnroller)
+        expectedTeamID="PS2F6S478M"
+        ;;
 
 
 

From 27e54e8ddddf22619dc1d449f0326c8f5f4aa7de Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Mon, 18 May 2020 11:45:42 +0200
Subject: [PATCH 21/30] fixed a stray typo

---
 Installomator.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Installomator.sh b/Installomator.sh
index 11c90d8..304379a 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -512,7 +512,7 @@ case $label in
         downloadURL=$(curl -fs https://royaltsx-v4.royalapps.com/updates_stable | xpath '//rss/channel/item[1]/enclosure/@url'  2>/dev/null | cut -d '"' -f 2)
         expectedTeamID="VXP8K9EDP6"
         ;;
-s    appcleaner)
+    appcleaner)
         # credit: Tadayuki Onishi (@kenchan0130)
         name="AppCleaner"
         type="zip"

From 4f396b5191d600ee61f435f9eed44ec9fe5ef002 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Mon, 18 May 2020 20:38:04 +0200
Subject: [PATCH 22/30] added adobereaderdc

---
 Installomator.sh | 14 ++++++++++----
 Labels.txt       |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Installomator.sh b/Installomator.sh
index 304379a..d2b2ee9 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -554,7 +554,13 @@ case $label in
         downloadURL=$(downloadURLFromGit jamf ReEnroller)
         expectedTeamID="PS2F6S478M"
         ;;
-
+    adobereaderdc)
+        name="Adobe Acrobat Reader DC"
+        type="pkgInDmg"
+        downloadURL=$(adobecurrent=`curl -s https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo http://ardownload.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDC_"$adobecurrent"_MUI.dmg)
+        expectedTeamID="JQ525L2MZD"
+        blockingProcesses=( "AdobeReader" )
+        ;;
 
 
 #    Note: Packages is signed but _not_ notarized, so spctl will reject it
@@ -991,8 +997,8 @@ installPkgInDmg() {
     mountDMG
     # locate pkg in dmg
     if [[ -z $pkgName ]]; then
-        # find a file starting with $name and ending with 'pkg'
-        findfiles=$(find -X "$dmgmount" -iname "${name}*.pkg" -maxdepth 1  )
+        # find first file ending with 'pkg'
+        findfiles=$(find -X "$dmgmount" -iname "*.pkg" -maxdepth 1  )
         filearray=( ${(0)findfiles} )
         if [[ ${#filearray} -eq 0 ]]; then
             cleanupAndExit 20 "couldn't find pkg in dmg $archiveName"
@@ -1015,7 +1021,7 @@ installPkgInZip() {
 
     # locate pkg in zip
     if [[ -z $pkgName ]]; then
-        # find a file starting with $name and ending with 'pkg'
+        # find first file starting with $name and ending with 'pkg'
         findfiles=$(find -X "$tmpDir" -iname "${name}*.pkg" -maxdepth 1  )
         filearray=( ${(0)findfiles} )
         if [[ ${#filearray} -eq 0 ]]; then
diff --git a/Labels.txt b/Labels.txt
index dc2bde0..602958d 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -1,4 +1,5 @@
 1password7
+adobereaderdc
 appclener
 atom
 autodmg

From 4472a9a2f3bbdb6303dcc4fb5008da5988dfa27f Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Tue, 19 May 2020 13:09:25 +0200
Subject: [PATCH 23/30] added signal

---
 Installomator.sh | 7 +++++++
 Labels.txt       | 1 +
 2 files changed, 8 insertions(+)

diff --git a/Installomator.sh b/Installomator.sh
index d2b2ee9..0cd3408 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -561,6 +561,13 @@ case $label in
         expectedTeamID="JQ525L2MZD"
         blockingProcesses=( "AdobeReader" )
         ;;
+    signal)
+        # credit: Søren Theilgaard
+        name="Signal"
+        type="dmg"
+        downloadURL=https://updates.signal.org/desktop/$(curl -fs https://updates.signal.org/desktop/latest-mac.yml | awk '/url/ && /dmg/ {print $3}')
+        expectedTeamID="U68MSDN6DR"
+        ;;
 
 
 #    Note: Packages is signed but _not_ notarized, so spctl will reject it
diff --git a/Labels.txt b/Labels.txt
index 602958d..a531577 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -56,6 +56,7 @@ privileges
 resiliosynchome
 royaltsx
 santa
+signal
 slack
 sonos
 sourcetree

From 73d386bfffbd24fa1431b45bad15381c77a3f342 Mon Sep 17 00:00:00 2001
From: Sebastien Jeanquier <sebastien@upvest.co>
Date: Wed, 20 May 2020 07:20:13 +0200
Subject: [PATCH 24/30] Add Docker Desktop

Add Docker Desktop
---
 Installomator.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Installomator.sh b/Installomator.sh
index 1b0da37..233c78e 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -635,7 +635,12 @@ case $label in
         updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
         updateToolArguments=( --install --apps WDAV00 )
         ;;
-
+    docker)
+        name="Docker"
+        type="dmg"
+        downloadURL="https://download.docker.com/mac/stable/Docker.dmg"
+        expectedTeamID="9BNSXJN65R"
+        ;;
 
     
     # these descriptions exist for testing and are intentionally broken

From 84510540c3a0565cccaebc6f32ea5c48ac000506 Mon Sep 17 00:00:00 2001
From: Sebastien Jeanquier <sebastien@upvest.co>
Date: Wed, 20 May 2020 09:12:11 +0200
Subject: [PATCH 25/30] Add Docker

Add Docker
---
 Labels.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Labels.txt b/Labels.txt
index 1ff8ea0..5d21cfe 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -8,6 +8,7 @@ cyberduck
 depnotify
 desktoppr
 discord
+docker
 dropbox
 eraseinstall
 firefox

From 9744b6683a87f71b317abe06d5e6e233cd58bc98 Mon Sep 17 00:00:00 2001
From: Sebastien Jeanquier <sebastien@upvest.co>
Date: Wed, 20 May 2020 09:43:57 +0200
Subject: [PATCH 26/30] Add Docker & Brave

Add Docker & Brave in (I think) the correct part of the script
---
 Installomator.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Installomator.sh b/Installomator.sh
index 233c78e..b0821ed 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -467,7 +467,19 @@ case $label in
         downloadURL=$(curl -fs https://royaltsx-v4.royalapps.com/updates_stable | xpath '//rss/channel/item[1]/enclosure/@url'  2>/dev/null | cut -d '"' -f 2)
         expectedTeamID="VXP8K9EDP6"
         ;;
-        
+    docker)
+        name="Docker"
+        type="dmg"
+        downloadURL="https://download.docker.com/mac/stable/Docker.dmg"
+        expectedTeamID="9BNSXJN65R"
+        ;;
+    brave)
+        name="Brave"
+        type="dmg"
+        downloadURL="https://laptop-updates.brave.com/latest/osx"
+        expectedTeamID="9BNSXJN65R"
+        ;;
+ 
 
 #    Note: Packages is signed but _not_ notarized, so spctl will reject it
 #    packages)
@@ -635,13 +647,6 @@ case $label in
         updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
         updateToolArguments=( --install --apps WDAV00 )
         ;;
-    docker)
-        name="Docker"
-        type="dmg"
-        downloadURL="https://download.docker.com/mac/stable/Docker.dmg"
-        expectedTeamID="9BNSXJN65R"
-        ;;
-
     
     # these descriptions exist for testing and are intentionally broken
     brokendownloadurl)

From 6dea2ac1361297b750a8543d088424f58f11bb43 Mon Sep 17 00:00:00 2001
From: Sebastien Jeanquier <sebastien@upvest.co>
Date: Wed, 20 May 2020 09:47:52 +0200
Subject: [PATCH 27/30] Add Brave Label

Add Brave Label
---
 Labels.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Labels.txt b/Labels.txt
index 5d21cfe..f10d55e 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -2,6 +2,7 @@
 atom
 aviatrix
 bbedit
+brave
 citrixworkspace
 coderunner
 cyberduck

From b67aa97f0deec6229a007d9267e749456e0a8ce9 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Fri, 22 May 2020 08:47:51 +0200
Subject: [PATCH 28/30] changed Webex Teams from pkgInDmg to dmg

---
 Installomator.sh | 2 +-
 identifier       | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 identifier

diff --git a/Installomator.sh b/Installomator.sh
index 0cd3408..f7ba40b 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -386,7 +386,7 @@ case $label in
     webexteams)
         # credit: Erik Stam (@erikstam)
         name="Webex Teams"
-        type="pkgInDmg"
+        type="dmg"
         downloadURL="https://binaries.webex.com/WebexTeamsDesktop-MACOS-Gold/WebexTeams.dmg"
         expectedTeamID="DE8Y96K9QP"
         ;;
diff --git a/identifier b/identifier
deleted file mode 100644
index e69de29..0000000

From 1b999a11018cbbc91b9abc6bad8168b40b17ac4e Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Fri, 22 May 2020 09:02:16 +0200
Subject: [PATCH 29/30] fixed goodgledrivefilestream

---
 Installomator.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Installomator.sh b/Installomator.sh
index f7ba40b..e44f51a 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -109,7 +109,8 @@ BLOCKING_PROCESS_ACTION=prompt_user
 # TODO: ?blockingProcesses for SharePointPlugin
 # TODO: generic function Sparkle to get latest download
 # TODO: ?notify user of errors
-# TODO: ?generic function to initiate a SparkleProcess
+# TODO: ?generic function to initiate a Sparkle Update
+# TODO: better version retrieval and reporting, before and after install
 
 
 # functions to help with getting info
@@ -416,6 +417,7 @@ case $label in
         name="Google Drive File Stream"
         type="pkgInDmg"
         downloadURL="https://dl.google.com/drive-file-stream/GoogleDriveFileStream.dmg"
+        pkgName="GoogleDriveFileStream.pkg"
         expectedTeamID="EQHXZ8M8AV"
         ;;
     plisteditpro)

From 27ef27851bf678e84e900a9ff33c3f8e1bcb1e7e Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Mon, 25 May 2020 14:52:41 +0200
Subject: [PATCH 30/30] fixed eraseinstall download url

---
 Installomator.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Installomator.sh b/Installomator.sh
index be0eaf1..20ee549 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -106,7 +106,6 @@ BLOCKING_PROCESS_ACTION=prompt_user
 # todos:
 
 # TODO: better logging (or, really, any logging other than echo)
-# TODO: ?blockingProcesses for SharePointPlugin
 # TODO: generic function Sparkle to get latest download
 # TODO: ?notify user of errors
 # TODO: ?generic function to initiate a Sparkle Update
@@ -270,7 +269,7 @@ case $label in
     eraseinstall)
         name="EraseInstall"
         type="pkg"
-        downloadURL=$(curl -fs https://bitbucket.org/prowarehouse-nl/erase-install/downloads/ | grep pkg | cut -d'"' -f2 | head -n 1)
+        downloadURL=https://bitbucket.org$(curl -fs https://bitbucket.org/prowarehouse-nl/erase-install/downloads/ | grep pkg | cut -d'"' -f2 | head -n 1)
         expectedTeamID="R55HK5K86Y"
         ;;
     omnigraffle7)
@@ -570,7 +569,6 @@ case $label in
         downloadURL=https://updates.signal.org/desktop/$(curl -fs https://updates.signal.org/desktop/latest-mac.yml | awk '/url/ && /dmg/ {print $3}')
         expectedTeamID="U68MSDN6DR"
         ;;
-
     docker)
         name="Docker"
         type="dmg"