mtan93/Installomator
1
0
Fork 0
mirror of https://github.com/mtan93/Installomator.git synced 2026-05-15 14:18:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into Fix-for-app-store-replacement-when-label-have-updatetool

Browse Source
This commit is contained in:
Søren Theilgaard
2022-01-09 21:22:27 +01:00
committed by GitHub
parent 791fd45bae cced10b1c6
commit 88367cf6b2
23 changed files with 93 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fragments/arguments.sh
+1 -1
View File
@@ -58,7 +58,7 @@ versionKey="CFBundleShortVersionString"
currentUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ { print $3 }')
# MARK: check for root
if [[ "$(whoami)" != "root" && "$DEBUG" -ne 2 ]]; then
if [[ "$(whoami)" != "root" && "$DEBUG" -eq 0 ]]; then
# not running as root
cleanupAndExit 6 "not running as root, exiting"
fi
fragments/functions.sh
+3 -2
View File
@@ -392,11 +392,12 @@ installAppWithPath() { # $1: path to app to install in $targetDir
fi
# set ownership to current user
if [ "$currentUser" != "loginwindow" ]; then
if [[ "$currentUser" != "loginwindow" && $SYSTEMOWNER -ne 1 ]]; then
printlog "Changing owner to $currentUser"
chown -R "$currentUser" "$targetDir/$appName"
else
printlog "No user logged in, not changing user"
printlog "No user logged in or SYSTEMOWNER=1, setting owner to root:wheel"
chown -R root:wheel "$targetDir/$appName"
fi
elif [[ ! -z $CLIInstaller ]]; then
fragments/header.sh
+7
View File
@@ -88,6 +88,13 @@ IGNORE_APP_STORE_APPS=no
# Shouldn’t give any problems for the user in most cases.
# Known bad example: Slack will loose all settings.
# Owner of copied apps
SYSTEMOWNER=0
# options:
# - 0 Current user will be owner of copied apps, just like if they
# installed it themselves (default).
# - 1 root:wheel will be set on the copied app.
# Useful for shared machines.
# install behavior
INSTALL=""
fragments/labels/applenyfonts.sh
+1 -1
View File
@@ -3,5 +3,5 @@ applenyfonts)
type="pkgInDmg"
downloadURL="https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
packageID="com.apple.pkg.NYFonts"
expectedTeamID="Development Update"
expectedTeamID="Software Update"
;;
fragments/labels/applesfcompact.sh
+1 -1
View File
@@ -3,5 +3,5 @@ applesfcompact)
type="pkgInDmg"
downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
packageID="com.apple.pkg.SanFranciscoCompact"
expectedTeamID="Development Update"
expectedTeamID="Software Update"
;;
fragments/labels/applesfpro.sh
+1 -1
View File
@@ -3,5 +3,5 @@ applesfpro)
type="pkgInDmg"
downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
packageID="com.apple.pkg.SanFranciscoPro"
expectedTeamID="Development Update"
expectedTeamID="Software Update"
;;
fragments/labels/autopkgr.sh
-2
View File
@@ -1,8 +1,6 @@
autopkgr)
# credit: Søren Theilgaard (@theilgaard)
name="AutoPkgr"
type="dmg"
#downloadURL=$(curl -fs "https://api.github.com/repos/lindegroup/autopkgr/releases/latest" | awk -F '"' "/browser_download_url/ && /dmg/ && ! /sig/ && ! /CLI/ && ! /sha256/ { print \$4 }")
downloadURL=$(downloadURLFromGit lindegroup autopkgr)
appNewVersion=$(versionFromGit lindegroup autopkgr)
expectedTeamID="JVY2ZR6SEF"
fragments/labels/boxdrive.sh
+1 -7
View File
@@ -1,12 +1,6 @@
boxdrive)
# credit: Isaac Ordonez, Mann consulting (@mannconsulting)
name="Box"
type="pkg"
if [[ $(arch) == "arm64" ]]; then
#Note: https://support.box.com/hc/en-us/articles/1500004479962-Box-Drive-support-on-devices-with-M1-chips
downloadURL="https://e3.boxcdn.net/desktop/pre-releases/mac/BoxDrive.2.20.140-M1-beta.pkg"
elif [[ $(arch) == "i386" ]]; then
downloadURL="https://e3.boxcdn.net/box-installers/desktop/releases/mac/Box.pkg"
fi
downloadURL="https://e3.boxcdn.net/box-installers/desktop/releases/mac/Box.pkg"
expectedTeamID="M683GB7CPW"
;;
fragments/labels/dangerzone.sh
+3 -3
View File
@@ -1,7 +1,7 @@
dangerzone)
# credit: Micah Lee (@micahflee)
name="Dangerzone"
type="dmg"
downloadURL=$(curl -s https://dangerzone.rocks/ | grep https://github.com/firstlookmedia/dangerzone/releases/download | grep \.dmg | cut -d'"' -f2)
expectedTeamID="P24U45L8P5"
downloadURL="$(downloadURLFromGit firstlookmedia dangerzone)"
appNewVersion="$(versionFromGit firstlookmedia dangerzone)"
expectedTeamID="N9B95FDWH4"
;;
fragments/labels/ferdi.sh
+6 -7
View File
@@ -1,13 +1,12 @@
ferdi)
name="Ferdi"
type="zip"
if [[ $(arch) == i386 ]]; then
downloadURL=$(curl --silent --fail "https://api.github.com/repos/getferdi/ferdi/releases/latest" \
| awk -F '"' "/browser_download_url/ && /mac.zip/ && ! /blockmap/ && ! /arm64-mac/ && ! /AppImage/{ print \$4 }")
elif [[ $(arch) == arm64 ]]; then
downloadURL=$(downloadURLFromGit getferdi ferdi )
archiveName="arm64-mac.zip"
fi
if [[ $(arch) == "arm64" ]]; then
archiveName="arm64-mac.zip"
elif [[ $(arch) == "i386" ]]; then
archiveName="Ferdi-[0-9.]*-mac.zip"
fi
downloadURL="$(downloadURLFromGit getferdi ferdi)"
appNewVersion=$(versionFromGit getferdi ferdi )
expectedTeamID="B6J9X9DWFL"
;;
fragments/labels/gpgsync.sh
+3 -2
View File
@@ -1,7 +1,8 @@
gpgsync)
# credit: Micah Lee (@micahflee)
name="GPG Sync"
type="pkg"
downloadURL="https://github.com$(curl -s -L https://github.com/firstlookmedia/gpgsync/releases/latest | grep /firstlookmedia/gpgsync/releases/download | grep \.pkg | cut -d'"' -f2)"
packageID="org.firstlook.gpgsync"
downloadURL="$(downloadURLFromGit firstlookmedia gpgsync)"
appNewVersion="$(versionFromGit firstlookmedia gpgsync)"
expectedTeamID="P24U45L8P5"
;;
fragments/labels/iina
+7
View File
@@ -0,0 +1,7 @@
iina)
name="IINA"
type="dmg"
downloadURL=$(downloadURLFromGit iina iina )
appNewVersion=$(versionFromGit iina iina )
expectedTeamID="67CQ77V27R"
;;
fragments/labels/itsycal.sh
+7
View File
@@ -0,0 +1,7 @@
itsycal)
name="Itsycal"
type="zip"
downloadURL=$(curl -fs https://s3.amazonaws.com/itsycal/itsycal-apple-silicon.xml | xpath '(//rss/channel/item/enclosure/@url)[1]' 2>/dev/null | head -1 | cut -d '"' -f 2)
appNewVersion=$(curl -fs https://s3.amazonaws.com/itsycal/itsycal-apple-silicon.xml | xpath '(//rss/channel/item/enclosure/@sparkle:shortVersionString)[1]' 2>/dev/null | head -1 | cut -d '"' -f 2)
expectedTeamID="HFT3T55WND"
;;
fragments/labels/paretosecurity.sh
+7
View File
@@ -0,0 +1,7 @@
paretosecurity)
name="Pareto Security"
type="dmg"
downloadURL=$(downloadURLFromGit ParetoSecurity pareto-mac)
appNewVersion=$(versionFromGit ParetoSecurity pareto-mac)
expectedTeamID="PM784W7B8X"
;;
fragments/labels/pritunl.sh
+13
View File
@@ -0,0 +1,13 @@
pritunl)
name="Pritunl"
type="pkgInZip"
packageID="com.pritunl.pkg.Pritunl"
if [[ $(arch) == "arm64" ]]; then
archiveName="Pritunl.arm64.pkg.zip"
elif [[ $(arch) == "i386" ]]; then
archiveName="Pritunl.pkg.zip"
fi
downloadURL=$(downloadURLFromGit pritunl pritunl-client-electron)
appNewVersion=$(versionFromGit pritunl pritunl-client-electron)
expectedTeamID="U22BLATN63"
;;
fragments/labels/proxyman.sh
+7 -6
View File
@@ -1,7 +1,8 @@
proxyman)
name="Proxyman"
type="dmg"
downloadURL="https://proxyman.io/release/osx/Proxyman_latest.dmg"
expectedTeamID="3X57WP8E8V"
appNewVersion=$(curl -s -L https://github.com/ProxymanApp/Proxyman | grep -o 'releases/tag/.*\>' | awk -F '/' '{print $3}')
;;
name="Proxyman"
type="dmg"
#downloadURL="https://proxyman.io/release/osx/Proxyman_latest.dmg"
downloadURL="$(downloadURLFromGit ProxymanApp Proxyman)"
appNewVersion="$(versionFromGit ProxymanApp Proxyman)"
expectedTeamID="3X57WP8E8V"
;;
fragments/labels/secretive.sh
+8
View File
@@ -0,0 +1,8 @@
secretive)
name="Secretive"
type="zip"
downloadURL=$(downloadURLFromGit maxgoedjen secretive)
appNewVersion=$(versionFromGit maxgoedjen secretive)
expectedTeamID="Z72PRUAWF6"
;;
fragments/labels/textexpander.sh
+2 -2
View File
@@ -1,7 +1,7 @@
textexpander)
name="TextExpander"
type="dmg"
downloadURL="https://textexpander.com/cgi-bin/redirect.pl?cmd=download&platform=osx"
appNewVersion=$( curl -fsIL "https://textexpander.com/cgi-bin/redirect.pl?cmd=download&platform=osx" | grep -i "^location" | awk '{print $2}' | tail -1 | cut -d "_" -f2 | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p' )
downloadURL="https://cgi.textexpander.com/cgi-bin/redirect.pl?cmd=download&platform=osx"
appNewVersion=$( curl -fsIL "https://cgi.textexpander.com/cgi-bin/redirect.pl?cmd=download&platform=osx" | grep -i "^location" | awk '{print $2}' | tail -1 | cut -d "_" -f2 | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p' )
expectedTeamID="7PKJ6G4DXL"
;;
fragments/labels/tidal.sh
+7
View File
@@ -0,0 +1,7 @@
tidal)
name="TIDAL"
type="dmg"
downloadURL="https://download.tidal.com/desktop/TIDAL.dmg"
appNewVersion=$(curl -fs https://update.tidal.com/updates/latest\?v\=1 | cut -d '"' -f4 | sed -E 's/https.*\/TIDAL\.([0-9.]*)\.zip/\1/g')
expectedTeamID="GK2243L7KB"
;;
fragments/labels/wireshark.sh
-1
View File
@@ -1,5 +1,4 @@
wireshark)
# credit: Oh4sh0 https://github.com/Oh4sh0
name="Wireshark"
type="dmg"
downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20Latest%20Intel%2064.dmg"