From b35db3342117829c4421ae2f22e795d4bc17c958 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Thu, 17 Dec 2020 10:53:14 +0100
Subject: [PATCH] whitespace fixes and updated Labels

---
 Installomator.sh | 212 +++++++++++++++++++++++------------------------
 Labels.txt       |   5 ++
 2 files changed, 111 insertions(+), 106 deletions(-)

diff --git a/Installomator.sh b/Installomator.sh
index 338c289..8ac2869 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -208,14 +208,14 @@ downloadURLFromGit() { # $1 git user name, $2 git repo name
 
 
 xpath() {
-	# the xpath tool changes in Big Sur and now requires the `-e` option	
-	if [[ $(sw_vers -buildVersion) > "20A" ]]; then
-		/usr/bin/xpath -e $@
-		# alternative: switch to xmllint (which is not perl)
-		#xmllint --xpath $@ -
-	else
-		/usr/bin/xpath $@
-	fi
+    # the xpath tool changes in Big Sur and now requires the `-e` option    
+    if [[ $(sw_vers -buildVersion) > "20A" ]]; then
+        /usr/bin/xpath -e $@
+        # alternative: switch to xmllint (which is not perl)
+        #xmllint --xpath $@ -
+    else
+        /usr/bin/xpath $@
+    fi
 }
 
 
@@ -376,10 +376,10 @@ mountDMG() {
 
 installFromDMG() {
     mountDMG
-	
-	applicationPath="$dmgmount/$appName"
-	printlog "looking for app: $applicationPath"
-	if [[ ! -d $applicationPath ]]; then
+    
+    applicationPath="$dmgmount/$appName"
+    printlog "looking for app: $applicationPath"
+    if [[ ! -d $applicationPath ]]; then
         # find first file ending with 'app'
         findfiles=$(find "$dmgmount" -iname "*.app" -maxdepth 1 -mindepth 1 )
         filearray=( ${(f)findfiles} )
@@ -388,8 +388,8 @@ installFromDMG() {
         fi
         applicationPath="${filearray[1]}"
         printlog "found app: $applicationPath"
-	fi
-	
+    fi
+    
     installAppWithPath "$applicationPath"
 }
 
@@ -541,7 +541,7 @@ if [[ $# -eq 0 ]]; then
     grep -E '^[a-z0-9\-]*(\)|\|\\)$' "$0" | tr -d ')|\' | grep -v -E '^(broken.*|longversion|version|valuesfromarguments)$' | sort
     exit 0
 elif [[ $1 == "/" ]]; then
-	# jamf uses sends '/' as the first argument
+    # jamf uses sends '/' as the first argument
     printlog "shifting arguments for Jamf"
     shift 3
 fi
@@ -941,11 +941,11 @@ teamviewer)
     expectedTeamID="H7UGFBUGV6"
     ;;
 teamviewerqs)
-	name="TeamViewerQS"
-	type="dmg"
-	downloadURL="https://download.teamviewer.com/download/TeamViewerQS.dmg"
-	expectedTeamID="H7UGFBUGV6"
-	;;
+    name="TeamViewerQS"
+    type="dmg"
+    downloadURL="https://download.teamviewer.com/download/TeamViewerQS.dmg"
+    expectedTeamID="H7UGFBUGV6"
+    ;;
 iterm2)
     name="iTerm"
     type="zip"
@@ -1286,12 +1286,12 @@ dialpad)
     ;;
 amazonworkspaces)
     # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
-	name="Workspaces"
-	type="pkg"
-	downloadURL="https://d2td7dqidlhjx7.cloudfront.net/prod/global/osx/WorkSpaces.pkg"
-	# appNewVersion=$(curl -fs https://d2td7dqidlhjx7.cloudfront.net/prod/iad/osx/WorkSpacesAppCast_macOS_20171023.xml | grep -o "Version*.*<" | head -1 | cut -d " " -f2 | cut -d "<" -f1)
-	expectedTeamID="94KV3E626L"
-	;;
+    name="Workspaces"
+    type="pkg"
+    downloadURL="https://d2td7dqidlhjx7.cloudfront.net/prod/global/osx/WorkSpaces.pkg"
+    # appNewVersion=$(curl -fs https://d2td7dqidlhjx7.cloudfront.net/prod/iad/osx/WorkSpacesAppCast_macOS_20171023.xml | grep -o "Version*.*<" | head -1 | cut -d " " -f2 | cut -d "<" -f1)
+    expectedTeamID="94KV3E626L"
+    ;;
 apparency)
     name="Apparency"
     type="dmg"
@@ -1300,26 +1300,26 @@ apparency)
     ;;
 skype)
     # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
-	# CONSUMER version of skype, business version is `microsoftskypeforbusiness`
-	name="Skype"
-	type="dmg"
-	downloadURL="https://get.skype.com/go/getskype-skypeformac"
-	expectedTeamID="AL798K98FX"
-	;;
+    # CONSUMER version of skype, business version is `microsoftskypeforbusiness`
+    name="Skype"
+    type="dmg"
+    downloadURL="https://get.skype.com/go/getskype-skypeformac"
+    expectedTeamID="AL798K98FX"
+    ;;
 bluejeans)
     # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
-	name="BlueJeans"
-	type="pkg"
-	downloadURL=$(curl -fs "https://www.bluejeans.com/downloads" | xmllint --html --format - 2>/dev/null | grep -o "https://.*BlueJeansInstaller.dmg" | sed 's/dmg/pkg/g')
-	expectedTeamID="HE4P42JBGN"
-	;;
+    name="BlueJeans"
+    type="pkg"
+    downloadURL=$(curl -fs "https://www.bluejeans.com/downloads" | xmllint --html --format - 2>/dev/null | grep -o "https://.*BlueJeansInstaller.dmg" | sed 's/dmg/pkg/g')
+    expectedTeamID="HE4P42JBGN"
+    ;;
 ricohpsprinters)
     # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
-	name="Ricoh PS Printers"
-	type="pkgInDmg"
-	downloadURL=$(curl -fs https://support.ricoh.com//bb/html/dr_ut_e/rc3/model/mpc3004ex/mpc3004exen.htm | xmllint --html --format - 2>/dev/null | grep -m 1 -o "https://.*.dmg" | cut -d '"' -f 1)
-	expectedTeamID="5KACUT3YX8"
-	;;
+    name="Ricoh PS Printers"
+    type="pkgInDmg"
+    downloadURL=$(curl -fs https://support.ricoh.com//bb/html/dr_ut_e/rc3/model/mpc3004ex/mpc3004exen.htm | xmllint --html --format - 2>/dev/null | grep -m 1 -o "https://.*.dmg" | cut -d '"' -f 1)
+    expectedTeamID="5KACUT3YX8"
+    ;;
 ringcentralphone)
     # credit: Eric Gjerde, When I Work (@ericgjerde on MacAdmins Slack)
     # note: the DMG says RingCentral Phone, the installed app says RingCentral Phone, but the app in the DMG is 'RingCentral for Mac.app'
@@ -1462,7 +1462,7 @@ googleearth)
     name="Google Earth Pro"
     type="pkgInDmg"
     downloadURL="https://dl.google.com/earth/client/advanced/current/GoogleEarthProMac-Intel.dmg"
-	  expectedTeamID="EQHXZ8M8AV"
+      expectedTeamID="EQHXZ8M8AV"
     ;;
 pymol)
     # credit: Fredrik Larsson (@fredrik_l on MacAdmins Slack)
@@ -1508,14 +1508,14 @@ libreoffice)
     expectedTeamID="7P5S3ZLCN7"
     ;;
 sketch)
-	# credit: Alex L. (@aloew on MacAdmins Slack)
+    # credit: Alex L. (@aloew on MacAdmins Slack)
     name="Sketch"
     type="zip"
     downloadURL="http://download.sketchapp.com/sketch.zip"
     expectedTeamID="WUGMZZ5K46"
     ;;
 abstract)
-	# credit: Alex L. (@aloew on MacAdmins Slack)
+    # credit: Alex L. (@aloew on MacAdmins Slack)
     name="Abstract"
     type="zip"
     downloadURL="https://api.goabstract.com/releases/latest/download"
@@ -1543,14 +1543,14 @@ balenaetcher)
     expectedTeamID="66H43P8FRG"
     ;;
 figma)
-	# credit: Alex L. (@aloew on MacAdmins Slack)
+    # credit: Alex L. (@aloew on MacAdmins Slack)
     name="Figma"
     type="zip"
     downloadURL="https://www.figma.com/download/desktop/mac/"
     expectedTeamID="T8RA8NE3B7"
     ;;
 jetbrainsidea)
-	# credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
+    # credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
     name="JetBrains IntelliJ Idea"
     type="dmg"
     expectedTeamID="2ZEFAR8TH3"
@@ -1558,7 +1558,7 @@ jetbrainsidea)
     downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=IIU&latest=true&type=release" | grep -o "mac*.*.dmg" | cut -d '"' -f5)
     ;;
 jetbrainspycharm)
-	# credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
+    # credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
     name="JetBrains PyCharm"
     type="dmg"
     expectedTeamID="2ZEFAR8TH3"
@@ -1566,7 +1566,7 @@ jetbrainspycharm)
     downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=PCP&latest=true&type=release" | grep -o "mac*.*.dmg" | cut -d '"' -f5)
     ;; 
 jetbrainsrubymine)
-	# credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
+    # credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
     name="JetBrains RubyMine"
     type="dmg"
     expectedTeamID="2ZEFAR8TH3"
@@ -1574,7 +1574,7 @@ jetbrainsrubymine)
     downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=RM&latest=true&type=release" | grep -o "mac*.*.dmg" | cut -d '"' -f5)
     ;; 
 jetbrainswebstorm)
-	# credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
+    # credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
     name="JetBrains Webstorm"
     type="dmg"
     expectedTeamID="2ZEFAR8TH3"
@@ -1582,7 +1582,7 @@ jetbrainswebstorm)
     downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=WS&latest=true&type=release" | grep -o "mac*.*.dmg" | cut -d '"' -f5)
     ;; 
 jetbrainsdatagrip)
-	# credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
+    # credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
     name="JetBrains DataGrip"
     type="dmg"
     expectedTeamID="2ZEFAR8TH3"
@@ -1590,7 +1590,7 @@ jetbrainsdatagrip)
     downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=DG&latest=true&type=release" | grep -o "mac*.*.dmg" | cut -d '"' -f5)
     ;; 
 jetbrainsclion)
-	# credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
+    # credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
     name="JetBrains CLion"
     type="dmg"
     expectedTeamID="2ZEFAR8TH3"
@@ -1598,7 +1598,7 @@ jetbrainsclion)
     downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=CL&latest=true&type=release" | grep -o "mac*.*.dmg" | cut -d '"' -f5)
     ;; 
 jetbrainsgoland)
-	# credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
+    # credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
     name="JetBrains GoLand"
     type="dmg"
     expectedTeamID="2ZEFAR8TH3"
@@ -1606,7 +1606,7 @@ jetbrainsgoland)
     downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=GO&latest=true&type=release" | grep -o "mac*.*.dmg" | cut -d '"' -f5)
     ;; 
 jetbrainsrider)
-	# credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
+    # credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
     name="JetBrains Rider"
     type="dmg"
     expectedTeamID="2ZEFAR8TH3"
@@ -1614,7 +1614,7 @@ jetbrainsrider)
     downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=RD&latest=true&type=release" | grep -o "mac*.*.dmg" | cut -d '"' -f5)
     ;;
 jetbrainsappcode)
-	# credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
+    # credit: Casey Jensen (@cajenson01 on MacAdmins Slack)
     name="JetBrains AppCode"
     type="dmg"
     expectedTeamID="2ZEFAR8TH3"
@@ -1623,7 +1623,7 @@ jetbrainsappcode)
     ;;  
 jetbrainsideace|\
 intellijideace)
-	# credit: Alex L. (@aloew on MacAdmins Slack)
+    # credit: Alex L. (@aloew on MacAdmins Slack)
     name="IntelliJ IDEA CE"
     type="dmg"
     downloadURL="https://download.jetbrains.com/product?code=IIC&latest&distribution=mac"
@@ -1631,21 +1631,21 @@ intellijideace)
     ;;
 jetbrainspycharmce|\
 pycharmce)
-	# credit: Alex L. (@aloew on MacAdmins Slack)
+    # credit: Alex L. (@aloew on MacAdmins Slack)
     name="PyCharm CE"
     type="dmg"
     downloadURL="https://download.jetbrains.com/product?code=PCC&latest&distribution=mac"
     expectedTeamID="2ZEFAR8TH3"
     ;;
 pitch)
-	#credit: @evil mwnci on MacAdmins Slack
+    #credit: @evil mwnci on MacAdmins Slack
     name="Pitch"
     type="dmg"
     downloadURL="https://desktop.pitch.com/mac/Pitch.dmg"
     expectedTeamID="KUCN8NUU6Z"
     ;;
 sidekick)
-	#credit: @evil mwnci on MacAdmins Slack
+    #credit: @evil mwnci on MacAdmins Slack
     name="Sidekick"
     type="dmg"
     downloadURL="https://api.meetsidekick.com/downloads/df/mac"
@@ -1681,48 +1681,48 @@ fsmonitor)
      downloadURL=$(curl --location --fail --silent "https://fsmonitor.com/FSMonitor/Archives/appcast2.xml" | xpath '//rss/channel/item[last()]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
      expectedTeamID="V85GBYB7B9"
      ;;
- ramboxce)
-     # credit: Adrian Bühler (@midni9ht)
-     name="Rambox"
-     type="dmg"
-     downloadURL=$(downloadURLFromGit ramboxapp community-edition )
-     expectedTeamID="7F292FPD69"
-     ;;
- adobebrackets)
-     # credit: Adrian Bühler (@midni9ht)
-     name="Brackets"
-     type="dmg"
-     downloadURL=$(downloadURLFromGit adobe brackets )
-     expectedTeamID="JQ525L2MZD"
-     ;;
- debookee)
-     # credit: Adrian Bühler (@midni9ht)
-     name="Debookee"
-     type="zip"
-     downloadURL=$(curl --location --fail --silent "https://www.iwaxx.com/debookee/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
-     expectedTeamID="AATLWWB4MZ"
-     ;;
- ferdi)
-     # credit: Adrian Bühler (@midni9ht)
-     name="Ferdi"
-     type="dmg"
-     downloadURL=$(downloadURLFromGit getferdi ferdi )
-     expectedTeamID="B6J9X9DWFL"
-     ;;
- hyper)
-     # credit: Adrian Bühler (@midni9ht)
-     name="Hyper"
-     type="dmg"
-     downloadURL=$(downloadURLFromGit vercel hyper )
-     expectedTeamID="JW6Y669B67"
-     ;;
+ramboxce)
+    # credit: Adrian Bühler (@midni9ht)
+    name="Rambox"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit ramboxapp community-edition )
+    expectedTeamID="7F292FPD69"
+    ;;
+adobebrackets)
+    # credit: Adrian Bühler (@midni9ht)
+    name="Brackets"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit adobe brackets )
+    expectedTeamID="JQ525L2MZD"
+    ;;
+debookee)
+    # credit: Adrian Bühler (@midni9ht)
+    name="Debookee"
+    type="zip"
+    downloadURL=$(curl --location --fail --silent "https://www.iwaxx.com/debookee/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
+    expectedTeamID="AATLWWB4MZ"
+    ;;
+ferdi)
+    # credit: Adrian Bühler (@midni9ht)
+    name="Ferdi"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit getferdi ferdi )
+    expectedTeamID="B6J9X9DWFL"
+    ;;
+hyper)
+    # credit: Adrian Bühler (@midni9ht)
+    name="Hyper"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit vercel hyper )
+    expectedTeamID="JW6Y669B67"
+    ;;
 menumeters)
-     # credit: Adrian Bühler (@midni9ht)
-     name="MenuMeters"
-     type="zip"
-     downloadURL=$(downloadURLFromGit yujitach MenuMeters )
-     expectedTeamID="95AQ7YKR5A"
-     ;;
+    # credit: Adrian Bühler (@midni9ht)
+    name="MenuMeters"
+    type="zip"
+    downloadURL=$(downloadURLFromGit yujitach MenuMeters )
+    expectedTeamID="95AQ7YKR5A"
+    ;;
 
 # MARK: add new labels above here
 
@@ -1894,12 +1894,12 @@ microsoftdefenderatp)
     ;;
 microsoftlicenseremovaltool)
     # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
-	name="Microsoft License Removal Tool"
-	type="pkg"
-	downloadURL="https://go.microsoft.com/fwlink/?linkid=849815"
-	expectedTeamID="QGS93ZLCU7"
-	# appNewVersion=$(curl -is "$downloadURL" | grep ocation: | grep -o "Microsoft_.*pkg" | cut -d "_" -f 5 | cut -d "." -f1-2)
-	;;
+    name="Microsoft License Removal Tool"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=849815"
+    expectedTeamID="QGS93ZLCU7"
+    # appNewVersion=$(curl -is "$downloadURL" | grep ocation: | grep -o "Microsoft_.*pkg" | cut -d "_" -f 5 | cut -d "." -f1-2)
+    ;;
 
 
 # this description is so you can provide all variables as arguments
diff --git a/Labels.txt b/Labels.txt
index ddc10dc..1619d30 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -1,6 +1,7 @@
 1password7
 8x8
 abstract
+adobebrackets
 adobereaderdc
 adobereaderdc-install
 adobereaderdc-update
@@ -31,6 +32,7 @@ cryptomator
 cyberduck
 dangerzone
 dbeaverce
+debookee
 depnotify
 desktoppr
 detectxswift
@@ -40,6 +42,7 @@ docker
 dropbox
 egnyte
 eraseinstall
+ferdi
 figma
 firefox
 firefoxesrpkg
@@ -56,6 +59,7 @@ gpgsuite
 gpgsync
 grandperspective
 handbrake
+hyper
 icons
 inkscape
 intellijideace
@@ -124,6 +128,7 @@ pycharmce
 pymol
 qgis-macos-pr
 r
+ramboxce
 resiliosynchome
 ricohpsprinters
 ringcentralapp