Commit Graph

901 Commits

Author SHA1 Message Date
Søren Theilgaard 2ba53683df Update main.sh
Currently (before this patch) a label like `microsoftonedrive` that was installed from App Store, and that we want to replace with the “ordinary” version, Installomator would use updateTool, even though `IGNORE_APP_STORE_APPS=yes`. So we would have to have `INSTALL=force` in order to have the app replaced, as `updateTool` would be used.

With this patch, if `IGNORE_APP_STORE_APPS=yes` then `updateTool` will be not set, and the App Store app would be replaced. But if the installed software was not from App Store, then `updateTool` would not be used, and it would be a kind of a forced install (except if the version is the same).

I have this output:
```
➜  Downloads sudo Installomator/utils/assemble.sh microsoftonedrive DEBUG=0
2021-11-30 10:12:11 microsoftonedrive setting variable from argument DEBUG=0
2021-11-30 10:12:11 microsoftonedrive ################## Start Installomator v. 9.0dev
2021-11-30 10:12:11 microsoftonedrive ################## microsoftonedrive
2021-11-30 10:12:13 microsoftonedrive Running msupdate --list
Checking for updates...
Update Assistant is available.
Update Assistant is checking for updates.
Update Assistant is available.
No updates available
2021-11-30 10:12:27 microsoftonedrive BLOCKING_PROCESS_ACTION=tell_user
2021-11-30 10:12:27 microsoftonedrive NOTIFY=success
2021-11-30 10:12:27 microsoftonedrive LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns
2021-11-30 10:12:27 microsoftonedrive no blocking processes defined, using OneDrive as default
2021-11-30 10:12:27 microsoftonedrive Changing directory to /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.5kJ1YWMy
2021-11-30 10:12:27 microsoftonedrive App(s) found: /Applications/OneDrive.app
2021-11-30 10:12:27 microsoftonedrive found app at /Applications/OneDrive.app, version 21.220.1024
2021-11-30 10:12:27 microsoftonedrive Installed OneDrive.app is from App Store, use “IGNORE_APP_STORE_APPS=yes” to replace.
2021-11-30 10:12:27 microsoftonedrive ERROR: App previously installed from App Store, and we respect that
2021-11-30 10:12:27 microsoftonedrive Deleting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.5kJ1YWMy
2021-11-30 10:12:27 microsoftonedrive App not closed, so no reopen.
2021-11-30 10:12:27 microsoftonedrive ################## End Installomator, exit code 1

➜  Downloads sudo Installomator/utils/assemble.sh microsoftonedrive DEBUG=0 IGNORE_APP_STORE_APPS=yes
2021-11-30 10:12:50 microsoftonedrive setting variable from argument DEBUG=0
2021-11-30 10:12:50 microsoftonedrive setting variable from argument IGNORE_APP_STORE_APPS=yes
2021-11-30 10:12:50 microsoftonedrive ################## Start Installomator v. 9.0dev
2021-11-30 10:12:50 microsoftonedrive ################## microsoftonedrive
2021-11-30 10:12:51 microsoftonedrive Running msupdate --list
Checking for updates...
Update Assistant is available.
Update Assistant is checking for updates.
Update Assistant is available.
No updates available
2021-11-30 10:13:06 microsoftonedrive BLOCKING_PROCESS_ACTION=tell_user
2021-11-30 10:13:06 microsoftonedrive NOTIFY=success
2021-11-30 10:13:06 microsoftonedrive LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns
2021-11-30 10:13:06 microsoftonedrive no blocking processes defined, using OneDrive as default
2021-11-30 10:13:06 microsoftonedrive Changing directory to /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.OXbBLX0y
2021-11-30 10:13:06 microsoftonedrive App(s) found: /Applications/OneDrive.app
2021-11-30 10:13:06 microsoftonedrive found app at /Applications/OneDrive.app, version 21.220.1024
2021-11-30 10:13:06 microsoftonedrive Installed OneDrive.app is from App Store, use “IGNORE_APP_STORE_APPS=yes” to replace.
2021-11-30 10:13:06 microsoftonedrive Replacing App Store apps, no matter the version
2021-11-30 10:13:06 microsoftonedrive appversion: 0
2021-11-30 10:13:06 microsoftonedrive Label is not of type “updateronly”, and it’s set to use force to install or ignoring app store apps, so not using updateTool.
2021-11-30 10:13:06 microsoftonedrive Latest version of OneDrive is 21.205.1003
2021-11-30 10:13:06 microsoftonedrive Downloading https://go.microsoft.com/fwlink/?linkid=823060 to OneDrive.pkg
2021-11-30 10:15:01 microsoftonedrive no more blocking processes, continue with update
2021-11-30 10:15:01 microsoftonedrive Installing OneDrive
2021-11-30 10:15:01 microsoftonedrive Verifying: OneDrive.pkg
2021-11-30 10:15:02 microsoftonedrive Team ID: UBF8T346G9 (expected: UBF8T346G9 )
2021-11-30 10:15:02 microsoftonedrive Installing OneDrive.pkg to /
installer: Package name is Microsoft OneDrive
installer: Upgrading at base path /
installer: The upgrade was successful.
2021-11-30 10:15:08 microsoftonedrive Finishing...
2021-11-30 10:15:18 microsoftonedrive App(s) found: /Applications/OneDrive.app
2021-11-30 10:15:18 microsoftonedrive found app at /Applications/OneDrive.app, version 21.220.1024
2021-11-30 10:15:18 microsoftonedrive Installed OneDrive.app is from App Store, use “IGNORE_APP_STORE_APPS=yes” to replace.
2021-11-30 10:15:18 microsoftonedrive Replacing App Store apps, no matter the version
2021-11-30 10:15:18 microsoftonedrive Installed OneDrive, version 0
2021-11-30 10:15:18 microsoftonedrive notifying
2021-11-30 10:15:18 microsoftonedrive Deleting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.OXbBLX0y
2021-11-30 10:15:18 microsoftonedrive App not closed, so no reopen.
2021-11-30 10:15:18 microsoftonedrive ################## End Installomator, exit code 0
```
2021-11-30 10:25:28 +01:00
Søren Theilgaard 49470cdfdd MDM scripts 2021-11-29 13:15:53 +01:00
Søren Theilgaard f997c702dd Merge pull request #338 from apizz/vimac 2021-11-26 08:07:33 +01:00
Søren Theilgaard f87540454b Merge pull request #339 from apizz/textexpander 2021-11-26 08:05:06 +01:00
AP Orlebeke 98c56d505b Fix TextExpander 2021-11-26 01:35:58 -05:00
AP Orlebeke 241df209b6 Add Vimac 2021-11-26 00:37:07 -05:00
Søren Theilgaard 0b3ab7b382 Merge pull request #278 from samess-flowers/dev
Move root user check forward and add in debug mode 2 to replicate lost functionality
2021-11-25 09:40:50 +01:00
Søren Theilgaard 52f1371042 Merge branch 'dev' into dev 2021-11-25 09:40:38 +01:00
Søren Theilgaard d8dbde032a Update CONTRIBUTING.md 2021-11-24 10:18:09 +01:00
Søren Theilgaard 9af3408da6 Merge pull request #334 from fleish/dev
Create protonvpn.sh
2021-11-24 10:10:42 +01:00
Søren Theilgaard 26b5956894 Update protonvpn.sh 2021-11-24 10:07:59 +01:00
Søren Theilgaard 4adbd1fd2c Update functions.sh 2021-11-24 09:47:35 +01:00
fleish 3dd9818d9a Update protonvpn.sh
appNewVersion
2021-11-23 08:29:05 -08:00
Søren Theilgaard d7042fce29 A bit cleaning in READMEs 2021-11-23 14:27:31 +01:00
Søren Theilgaard 2178caae0e Update CHANGELOG.md 2021-11-23 13:07:19 +01:00
Armin Briegel f718e60269 updated version 2021-11-23 11:30:06 +01:00
Armin Briegel a54c9f0dbc updated version to v8.0 v8.0 2021-11-23 11:10:14 +01:00
Armin Briegel 89dffc5989 cleaned up some labels and chan 2021-11-23 11:05:27 +01:00
Armin Briegel 74ff5ecb08 Merge pull request #333 from apizz/sqlpropostgres2
Add SQLPro Postgres
2021-11-23 10:44:50 +01:00
Armin Briegel 9cc4972f62 Merge pull request #332 from apizz/sqlpropostgres
Add SQLPro Studio
2021-11-23 10:43:59 +01:00
Søren Theilgaard b43ebe3483 Update functions.sh 2021-11-23 09:49:37 +01:00
Søren Theilgaard 5fcb4174f0 Update CHANGELOG.md 2021-11-23 09:06:03 +01:00
Søren Theilgaard 2a15a2142d Moved root check to before case statement
We can have code in the case statement, so no need to run that, if we were supposed to exit.
2021-11-23 08:59:44 +01:00
fleish ade237079c Create protonvpn.sh 2021-11-22 11:53:17 -08:00
AP Orlebeke 4117b687e8 Add SQLPro Postgres 2021-11-22 11:15:43 -05:00
AP Orlebeke c6237ca193 Add SQLPro Studio 2021-11-22 10:52:36 -05:00
Søren Theilgaard d6a9d6707e Update functions.sh 2021-11-22 16:21:24 +01:00
Søren Theilgaard ccc58d9dc1 Update bluejeans.sh 2021-11-22 15:58:57 +01:00
Søren Theilgaard 7ac31c00fc Update vscodium.sh 2021-11-22 15:53:26 +01:00
Søren Theilgaard 6da46f30a2 Update vagrant.sh 2021-11-22 15:46:58 +01:00
Søren Theilgaard 4b59622348 Update screencloudplayer.sh 2021-11-22 15:22:14 +01:00
Søren Theilgaard 9c060635df Update logitechoptions.sh 2021-11-22 14:56:23 +01:00
Søren Theilgaard 87f4b4e967 Update lexarrecoverytool.sh 2021-11-22 14:54:10 +01:00
Søren Theilgaard 9923a03a12 Update inkscape.sh 2021-11-22 14:50:00 +01:00
Søren Theilgaard 4b87ffd5df Update inkscape.sh 2021-11-22 14:38:05 +01:00
Søren Theilgaard 57c5113554 firefox 2021-11-22 12:53:34 +01:00
Søren Theilgaard 25fdfc38f9 Update fastscripts.sh 2021-11-22 12:03:32 +01:00
Søren Theilgaard 19ac07ca77 Update dialog.sh 2021-11-22 12:00:06 +01:00
Søren Theilgaard 1260d9b9d1 label fixes 2021-11-22 11:55:26 +01:00
Søren Theilgaard e5c25aa867 DEBUG check in microsoft labels 2021-11-22 11:31:20 +01:00
Søren Theilgaard f621d36981 Error in label check for “version”
Fixed.
2021-11-22 11:05:34 +01:00
Søren Theilgaard bf6fda07d6 Update Labels.txt 2021-11-22 11:00:56 +01:00
Søren Theilgaard 80082691b9 Merge pull request #328 from Installomator/MDM-script-with-caffeine
MDM with caffeinate
2021-11-22 10:59:49 +01:00
Søren Theilgaard d50a825482 Merge branch 'dev' into MDM-script-with-caffeine 2021-11-22 10:59:39 +01:00
Søren Theilgaard 6aa32cba1c Merge pull request #317 from Installomator/Theile-labels
Theile-labels
2021-11-22 10:58:51 +01:00
Søren Theilgaard cb45cab5c7 Merge pull request #285 from jnichols35/label-superhuman
label superhuman.sh
2021-11-22 10:53:25 +01:00
Søren Theilgaard 8089187598 superhuman version 2021-11-22 10:53:05 +01:00
Søren Theilgaard e8f5fd0a2a Merge pull request #288 from jnichols35/label-logseq
label logseq.sh
2021-11-22 10:43:44 +01:00
Søren Theilgaard 7e56354cb1 Labels from #289 2021-11-22 10:42:19 +01:00
Søren Theilgaard 5880124676 Merge pull request #311 from Raptor399/boxtools-fix
Added packedID so Box Tools installs correctly
2021-11-22 10:18:38 +01:00