mtan93/Installomator
1
0
Fork 0
mirror of https://github.com/mtan93/Installomator.git synced 2026-03-19 05:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

added qgis and fixed some logic in installFromDMG

Browse Source
This commit is contained in:
Armin Briegel
2020-10-29 13:57:32 +01:00
parent 430998acd4
commit 1bf4ea03ec
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -1,6 +1,6 @@
## v0.5 - 2020- ## v0.5 - 2020-
- - when Installomator cannot find an app in a dmg with the given appName it will now use the first .app in the root dir. This is for applications which contain the version number in the application name. Note: this might lead to multiple versions of the app in the /Applications directory. You will have to find a different means to clean these up when necessary
## v0.4 - 2020-10-19 ## v0.4 - 2020-10-19
@@ -21,6 +21,7 @@
- improved logging in some statements - improved logging in some statements
- several more minor improvements - several more minor improvements
## v0.2 - 2020-06-09 ## v0.2 - 2020-06-09
- many fixes for broken URLs and other bugs - many fixes for broken URLs and other bugs
@@ -30,4 +31,5 @@
improved logging improved logging
- several new applications: count increased from 62 in 0.1 to 87 in 0.2 - several new applications: count increased from 62 in 0.1 to 87 in 0.2
## v0.1 - 2020-05-12 ## v0.1 - 2020-05-12

17
Installomator.sh
View File

@@ -377,10 +377,11 @@ mountDMG() {
installFromDMG() { installFromDMG() {
mountDMG mountDMG
applicationPath="$dmgmount/$appname" applicationPath="$dmgmount/$appName"
if [[ -d $applicationPath ]]; then printlog "looking for app: $applicationPath"
if [[ ! -d $applicationPath ]]; then
# find first file ending with 'app' # find first file ending with 'app'
findfiles=$(find "$dmgmount" -iname "*.app" -maxdepth 1 ) findfiles=$(find "$dmgmount" -iname "*.app" -maxdepth 1 -mindepth 1 )
filearray=( ${(f)findfiles} ) filearray=( ${(f)findfiles} )
if [[ ${#filearray} -eq 0 ]]; then if [[ ${#filearray} -eq 0 ]]; then
cleanupAndExit 21 "couldn't find app in dmg $archiveName" cleanupAndExit 21 "couldn't find app in dmg $archiveName"
@@ -467,7 +468,7 @@ installPkgInDmg() {
# locate pkg in dmg # locate pkg in dmg
if [[ -z $pkgName ]]; then if [[ -z $pkgName ]]; then
# find first file ending with 'pkg' # find first file ending with 'pkg'
findfiles=$(find "$dmgmount" -iname "*.pkg" -maxdepth 1 ) findfiles=$(find "$dmgmount" -iname "*.pkg" -maxdepth 1 -mindepth 1 )
filearray=( ${(f)findfiles} ) filearray=( ${(f)findfiles} )
if [[ ${#filearray} -eq 0 ]]; then if [[ ${#filearray} -eq 0 ]]; then
cleanupAndExit 20 "couldn't find pkg in dmg $archiveName" cleanupAndExit 20 "couldn't find pkg in dmg $archiveName"
@@ -1334,7 +1335,13 @@ gimp)
downloadURL=https://$(curl -s -L "https://www.gimp.org/downloads/" | grep -Eio 'download.gimp.org/mirror/pub/gimp/v.*/osx/(.*).dmg') downloadURL=https://$(curl -s -L "https://www.gimp.org/downloads/" | grep -Eio 'download.gimp.org/mirror/pub/gimp/v.*/osx/(.*).dmg')
expectedTeamID="T25BQ8HSJF" expectedTeamID="T25BQ8HSJF"
;; ;;
qgis-macos-pr)
# credit: Rob Smithers (@SmithersJr on MacAdmins Slack)
name="QGIS"
type="dmg"
downloadURL="https://qgis.org/downloads/macos/qgis-macos-pr.dmg"
expectedTeamID="4F7N4UDA22"
;;
# MARK: add new labels above here # MARK: add new labels above here