mtan93/Installomator
1
0
Fork 0
mirror of https://github.com/mtan93/Installomator.git synced 2026-03-20 13:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,653 Commits 12 Branches 17 Tags
0ceb8d28037a802dfcc6de7a4597aaf0543bd28a
Commit Graph

111 Commits

Author SHA1 Message Date
Søren Theilgaard
0ceb8d2803 Merge pull request #658 from Theile/Dialog-additions 
Dialog update when app is already at the latest version
 2022-09-30 21:30:34 +02:00
Armin Briegel
d96c300cf8 updated label: libreoffice 2022-09-02 12:51:20 +02:00
Armin Briegel
6556cfd7d4 fixed typo 2022-09-02 12:51:00 +02:00
Armin Briegel
c981b093a2 Merge pull request #653 from mwmatter/main 
Workspace ONE Support
 2022-09-02 10:31:05 +02:00
Takanori TANIGUCHI
32721128f6 Duplicate #659 2022-08-30 09:55:20 +09:00
Søren Theilgaard
f7e2c5e000 Final fix for GitHub downloadURL 
For all labels tested it gives the same results as API-URL.
 2022-08-29 12:50:28 +02:00
Søren Theilgaard
9157d4763b Better new GitHub downloadURL 2022-08-29 09:45:27 +02:00
Takanori TANIGUCHI
ab6aedc460 Fix downloadURLFromGit() 2022-08-28 09:44:30 +09:00
Søren Theilgaard
916da6283e Change mathing on archiveName for GitHub. 2022-08-23 15:10:55 +02:00
Søren Theilgaard
a8ba97b87e One $ too many 2022-08-19 15:08:42 +02:00
Søren Theilgaard
25c39caafc Also without archiveName … 
… do we only need on line result.

So `tail -1` has been added to the other part as well.

Several labels failed in test.
 2022-08-19 15:07:44 +02:00
Søren Theilgaard
780bc3924b Minor change if archiveName is used 
Only return the last URL, if more lines are returned on the `archiveName` grep.
 2022-08-19 14:30:29 +02:00
Søren Theilgaard
dcfd7d8328 More Dialog messages 2022-08-19 11:19:12 +02:00
Mike Matter
87cdb11039 Workspace ONE Support 
Revised PR for Workspace ONE support.
 2022-08-16 15:18:04 -05:00
Armin Briegel
58ee21152c Merge pull request #641 from scriptingosx/swiftdialog 
swiftDialog Integration
 2022-08-12 16:35:40 +02:00
Armin Briegel
d5cbee8cb7 Merge pull request #643 from scriptingosx/exitcodes 
updated redundant exit codes
 2022-08-12 16:34:22 +02:00
Armin Briegel
a00997ef46 Merge pull request #543 from Installomator/GitHub-calls-without-API 
GitHub without API calls
 2022-08-12 14:56:12 +02:00
Armin Briegel
1477457155 updated redundant exit codes, closes #561 
See also: https://github.com/Installomator/Installomator/wiki/Installomator-Exit-Codes
 2022-08-12 13:47:44 +02:00
Armin Briegel
a094ffca67 now shows verifying step, code cleanup 2022-08-02 17:04:35 +02:00
Armin Briegel
719ca81bcb fixed wrong status icons 2022-08-02 16:51:56 +02:00
Armin Briegel
a308ccbc29 code cleanup 2022-08-02 14:51:18 +02:00
Armin Briegel
1d49c08344 now displays installer progress in list and main 2022-08-01 14:44:51 +02:00
Armin Briegel
4905091908 list item update working with swiftdialog Alpha 1.12.0.3169 2022-08-01 08:39:03 +02:00
Armin Briegel
720128f23a does not download swiftui if it is already there 2022-07-29 19:34:21 +02:00
Armin Briegel
0063c0e025 created swiftdialog_example.sh 2022-07-29 18:47:28 +02:00
Armin Briegel
ef3113a05f changed variable names to match standards 2022-07-29 15:20:22 +02:00
Bart Reardon
dfe9860848 fixed doubleup of value. added dialog complete action to cleanup tasks 2022-07-26 14:00:13 +10:00
Bart Reardon
84e0d5d263 playing with the look of the dialog 2022-07-26 13:12:15 +10:00
Bart Reardon
18638141b6 Initial go at integrating swiftDialog into Installomator to give progress of downoad and install of applications 2022-07-26 12:26:56 +10:00
Søren Theilgaard
1de3838a9b GitHub without API calls 
I have tested two labels, the first has an `archiveName`, the second does not:
```
➜  Installomator/utils/assemble.sh marathoninfinity DEBUG=0
2022-05-18 14:58:34 : WARN  : marathoninfinity : setting variable from argument DEBUG=0
2022-05-18 14:58:34 : REQ   : marathoninfinity : ################## Start Installomator v. 9.2beta, date 2022-05-18
2022-05-18 14:58:34 : INFO  : marathoninfinity : ################## Version: 9.2beta
2022-05-18 14:58:34 : INFO  : marathoninfinity : ################## Date: 2022-05-18
2022-05-18 14:58:34 : INFO  : marathoninfinity : ################## marathoninfinity
2022-05-18 14:58:34 : INFO  : marathoninfinity : BLOCKING_PROCESS_ACTION=tell_user
2022-05-18 14:58:34 : INFO  : marathoninfinity : NOTIFY=success
2022-05-18 14:58:34 : INFO  : marathoninfinity : LOGGING=INFO
2022-05-18 14:58:34 : INFO  : marathoninfinity : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns
2022-05-18 14:58:34 : INFO  : marathoninfinity : Label type: dmg
2022-05-18 14:58:34 : INFO  : marathoninfinity : archiveName: MarathonInfinity-[0-9.]*-Mac.dmg
2022-05-18 14:58:34 : INFO  : marathoninfinity : no blocking processes defined, using Marathon Infinity as default
2022-05-18 14:58:34 : INFO  : marathoninfinity : App(s) found: /Applications/Marathon Infinity.app
2022-05-18 14:58:34 : INFO  : marathoninfinity : found app at /Applications/Marathon Infinity.app, version 1.4, on versionKey CFBundleShortVersionString
2022-05-18 14:58:34 : INFO  : marathoninfinity : appversion: 1.4
2022-05-18 14:58:34 : INFO  : marathoninfinity : Latest version of Marathon Infinity is 20220115
2022-05-18 14:58:34 : REQ   : marathoninfinity : Downloading https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20220115/MarathonInfinity-20220115-Mac.dmg to MarathonInfinity-[0-9.]*-Mac.dmg
2022-05-18 14:58:35 : REQ   : marathoninfinity : no more blocking processes, continue with update
2022-05-18 14:58:35 : REQ   : marathoninfinity : Installing Marathon Infinity
2022-05-18 14:58:35 : INFO  : marathoninfinity : Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.uxoEpUyC/MarathonInfinity-[0-9.]*-Mac.dmg
2022-05-18 14:58:39 : INFO  : marathoninfinity : Mounted: /Volumes/Marathon Infinity
2022-05-18 14:58:39 : INFO  : marathoninfinity : Verifying: /Volumes/Marathon Infinity/Marathon Infinity.app
2022-05-18 14:58:43 : INFO  : marathoninfinity : Team ID matching: E8K89CXZE7 (expected: E8K89CXZE7 )
2022-05-18 14:58:43 : INFO  : marathoninfinity : Downloaded version of Marathon Infinity is 1.5 on versionKey CFBundleShortVersionString (replacing version 1.4).
2022-05-18 14:58:43 : INFO  : marathoninfinity : App has LSMinimumSystemVersion: 10.11.0
2022-05-18 14:58:43 : WARN  : marathoninfinity : Removing existing /Applications/Marathon Infinity.app
2022-05-18 14:58:43 : INFO  : marathoninfinity : Copy /Volumes/Marathon Infinity/Marathon Infinity.app to /Applications
2022-05-18 14:58:44 : WARN  : marathoninfinity : Changing owner to st
2022-05-18 14:58:44 : INFO  : marathoninfinity : Finishing...
2022-05-18 14:58:54 : INFO  : marathoninfinity : App(s) found: /Applications/Marathon Infinity.app
2022-05-18 14:58:54 : INFO  : marathoninfinity : found app at /Applications/Marathon Infinity.app, version 1.5, on versionKey CFBundleShortVersionString
2022-05-18 14:58:54 : REQ   : marathoninfinity : Installed Marathon Infinity, version 1.5
2022-05-18 14:58:54 : INFO  : marathoninfinity : notifying
2022-05-18 14:58:55 : INFO  : marathoninfinity : App not closed, so no reopen.
2022-05-18 14:58:55 : REQ   : marathoninfinity : All done!
2022-05-18 14:58:55 : REQ   : marathoninfinity : ################## End Installomator, exit code 0

➜  Installomator/utils/assemble.sh installomator DEBUG=0 INSTALL=force
2022-05-18 14:59:41 : WARN  : installomator : setting variable from argument DEBUG=0
2022-05-18 14:59:41 : WARN  : installomator : setting variable from argument INSTALL=force
2022-05-18 14:59:41 : REQ   : installomator : ################## Start Installomator v. 9.2beta, date 2022-05-18
2022-05-18 14:59:41 : INFO  : installomator : ################## Version: 9.2beta
2022-05-18 14:59:41 : INFO  : installomator : ################## Date: 2022-05-18
2022-05-18 14:59:41 : INFO  : installomator : ################## installomator
2022-05-18 14:59:42 : INFO  : installomator : BLOCKING_PROCESS_ACTION=tell_user
2022-05-18 14:59:42 : INFO  : installomator : NOTIFY=success
2022-05-18 14:59:42 : INFO  : installomator : LOGGING=INFO
2022-05-18 14:59:42 : INFO  : installomator : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns
2022-05-18 14:59:42 : INFO  : installomator : Label type: pkg
2022-05-18 14:59:42 : INFO  : installomator : archiveName: Installomator.pkg
2022-05-18 14:59:42 : INFO  : installomator : found packageID com.scriptingosx.Installomator installed, version 9.2
2022-05-18 14:59:42 : INFO  : installomator : appversion: 9.2
2022-05-18 14:59:42 : INFO  : installomator : Label is not of type “updateronly”, and it’s set to use force to install or ignoring app store apps, so not using updateTool.
2022-05-18 14:59:42 : INFO  : installomator : Latest version of Installomator is 9.2
2022-05-18 14:59:42 : INFO  : installomator : There is no newer version available.
2022-05-18 14:59:42 : REQ   : installomator : Downloading https://github.com/Installomator/Installomator/releases/download/v9.2/Installomator-9.2.pkg to Installomator.pkg
2022-05-18 14:59:43 : REQ   : installomator : Installing Installomator
2022-05-18 14:59:43 : INFO  : installomator : Verifying: Installomator.pkg
2022-05-18 14:59:43 : INFO  : installomator : Team ID: JME5BW3F3R (expected: JME5BW3F3R )
2022-05-18 14:59:43 : INFO  : installomator : Checking package version.
2022-05-18 14:59:43 : INFO  : installomator : Downloaded package com.scriptingosx.Installomator version 9.2
2022-05-18 14:59:43 : INFO  : installomator : Downloaded version of Installomator is the same as installed.
2022-05-18 14:59:43 : INFO  : installomator : Using force to install anyway.
2022-05-18 14:59:43 : INFO  : installomator : Installing Installomator.pkg to /
2022-05-18 14:59:46 : INFO  : installomator : Finishing...
2022-05-18 14:59:56 : INFO  : installomator : found packageID com.scriptingosx.Installomator installed, version 9.2
2022-05-18 14:59:56 : REQ   : installomator : Installed Installomator, version 9.2
2022-05-18 14:59:56 : INFO  : installomator : notifying
2022-05-18 14:59:57 : INFO  : installomator : App not closed, so no reopen.
2022-05-18 14:59:57 : REQ   : installomator : All done!
2022-05-18 14:59:57 : REQ   : installomator : ################## End Installomator, exit code 0
```
The version comparison in marathininfinity will be updated shortly.
 2022-05-18 15:02:32 +02:00
Armin Briegel
2b658a576c added function for JSON parsing using JXA 2022-05-13 10:44:26 +02:00
Armin Briegel
07d51c3239 Merge pull request #434 from Installomator/Fix-for-applist-line 
Update functions.sh
 2022-05-12 09:39:59 +02:00
Armin Briegel
b512ae17a3 merged #436 2022-03-18 11:08:46 +01:00
Søren Theilgaard
ed737510bb Fixed bad copy-paste 2022-03-07 09:42:51 +01:00
Bart Reardon
2a9b73dba7 update downloadURLFromGit() and versionFromGit() to follow redirects 2022-03-06 08:50:49 +11:00
Søren Theilgaard
9f79cf4d65 Update functions.sh 2022-03-03 21:35:22 +01:00
Søren Theilgaard
9b6c337d7a Improved logging for app copy with ditto 
And a few lines changed to `WARN`.
 2022-02-21 21:53:18 +01:00
Søren Theilgaard
9fd2b87e3c Few logging levels changed 
I want to return a valid explanation for log level REQ for why the script stops.
 2022-02-21 16:47:57 +01:00
Armin Briegel
1e3a50c07f Merge branch 'app-searching-changes-in-getAppVersion' into dev-v9.0.1 2022-02-18 16:56:22 +01:00
Søren Theilgaard
cba0e8c766 Merge branch 'Logging-level-improvements' of https://github.com/Installomator/Installomator into Logging-level-improvements 2022-02-09 16:24:40 +01:00
Søren Theilgaard
a25c904ba7 Update functions.sh 2022-02-09 16:23:52 +01:00
Armin Briegel
9afdc233f9 replaced a stray 'tmpdir' 2022-02-09 15:49:05 +01:00
Søren Theilgaard
ff8a9c2c3a Few more DEBUG loggings 2022-02-09 14:38:58 +01:00
Søren Theilgaard
bf740d1ffe Update functions.sh 2022-02-09 14:23:32 +01:00
Søren Theilgaard
1da37a13ca Another ls that could return an error 2022-02-09 14:10:01 +01:00
Søren Theilgaard
b30d4da703 Update functions.sh 2022-02-09 14:04:23 +01:00
Søren Theilgaard
c3714d855c Missing spaces 
After manually moving Firefox to Utilities I have tested with this:
```
$ sudo /Installomator/utils/assemble.sh firefox DEBUG=0 INSTALL=force
2022-02-09 09:44:04 : INFO  : firefox : setting variable from argument DEBUG=0
2022-02-09 09:44:04 : INFO  : firefox : setting variable from argument INSTALL=force
2022-02-09 09:44:04 : REQ   : firefox : ################## Start Installomator v. 9.1beta, date 2022-02-09
2022-02-09 09:44:04 : INFO  : firefox : ################## Version: 9.1beta
2022-02-09 09:44:04 : INFO  : firefox : ################## Date: 2022-02-09
2022-02-09 09:44:04 : INFO  : firefox : ################## firefox
2022-02-09 09:44:04 : INFO  : firefox : BLOCKING_PROCESS_ACTION=tell_user
2022-02-09 09:44:04 : INFO  : firefox : NOTIFY=success
2022-02-09 09:44:04 : INFO  : firefox : LOGGING=INFO
2022-02-09 09:44:04 : INFO  : firefox : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns
2022-02-09 09:44:04 : INFO  : firefox : Label type: dmg
2022-02-09 09:44:04 : INFO  : firefox : targetDir for installation: /Applications/Utilities
2022-02-09 09:44:04 : INFO  : firefox : found app at /Applications/Utilities/Firefox.app, version 97.0, on versionKey CFBundleShortVersionString
2022-02-09 09:44:04 : INFO  : firefox : appversion: 97.0
2022-02-09 09:44:04 : INFO  : firefox : Label is not of type “updateronly”, and it’s set to use force to install or ignoring app store apps, so not using updateTool.
2022-02-09 09:44:04 : INFO  : firefox : Latest version of Firefox is 97.0
2022-02-09 09:44:04 : INFO  : firefox : There is no newer version available.
2022-02-09 09:44:04 : REQ   : firefox : Downloading https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US to Firefox.dmg
2022-02-09 09:44:16 : REQ   : firefox : no more blocking processes, continue with update
2022-02-09 09:44:16 : REQ   : firefox : Installing Firefox
2022-02-09 09:44:16 : INFO  : firefox : Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.NMItuUfS/Firefox.dmg
2022-02-09 09:44:24 : INFO  : firefox : Mounted: /Volumes/Firefox
2022-02-09 09:44:24 : INFO  : firefox : Verifying: /Volumes/Firefox/Firefox.app
2022-02-09 09:44:33 : INFO  : firefox : Team ID matching: 43AQ936H96 (expected: 43AQ936H96 )
2022-02-09 09:44:33 : INFO  : firefox : Downloaded version of Firefox is 97.0 on versionKey CFBundleShortVersionString, same as installed.
2022-02-09 09:44:33 : INFO  : firefox : Using force to install anyway.
2022-02-09 09:44:33 : INFO  : firefox : App has LSMinimumSystemVersion: 10.12.0
2022-02-09 09:44:33 : INFO  : firefox : Copy /Volumes/Firefox/Firefox.app to /Applications/Utilities
2022-02-09 09:44:40 : INFO  : firefox : Changing owner to st
2022-02-09 09:44:40 : INFO  : firefox : Finishing...
2022-02-09 09:44:50 : INFO  : firefox : targetDir for installation: /Applications/Utilities
2022-02-09 09:44:50 : INFO  : firefox : found app at /Applications/Utilities/Firefox.app, version 97.0, on versionKey CFBundleShortVersionString
2022-02-09 09:44:50 : INFO  : firefox : Installed Firefox, version 97.0
2022-02-09 09:44:50 : INFO  : firefox : notifying
2022-02-09 09:44:50 : REQ   : firefox : ################## End Installomator, exit code 0
```
 2022-02-09 09:46:24 +01:00
Søren Theilgaard
dd83f6bd75 Update functions.sh 2022-02-09 09:41:03 +01:00
Søren Theilgaard
c55cc788bb Update functions.sh 2022-02-09 09:21:46 +01:00
Søren Theilgaard
557d63a4f3 If we exit a 0 we should still get the exit message 2022-02-08 13:48:33 +01:00