diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-06-16 11:40:16 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-06-16 22:15:52 +0200 |
| commit | 7c656ecff61608241955e37b6e7e165ac642105c (patch) | |
| tree | 2fc266771ffa08bf31e9876c9b1acd6f3a763361 /setup_native | |
| parent | 65c1418330c30406aa896d72576f368e67462a23 (diff) | |
macOS fix langpack installer with manually selected .app directory
For cases when there are multiple matching apps where the Languagepack
might be installed to, the "make sure to launch LO once before
installing the langpack" mechanism can fail.
Even if it is the call "tell application <selection> to activate" that
fails, the error handler assumes that the untar operation didn't work
and suggests to retry with admin privileges, modifying the .app bundle
before having it started once (AKA verified by gatekeeper), breaking
the app.
Passing the full path to the application object should fix that.
Change-Id: I47d61ad68e225fbdba191702ba85598164602e81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96449
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 20c17b0ffb89102d086f80303887a8594f0c3c8c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96425
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/scripts/osx_install_languagepack.applescript | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript index 107029421d1d..8ad55396766a 100644 --- a/setup_native/scripts/osx_install_languagepack.applescript +++ b/setup_native/scripts/osx_install_languagepack.applescript @@ -146,10 +146,11 @@ try (* A start of unchanged LO must take place so Gatekeeper will verify the signature prior to installing the languagepack *) - if application choice is not running then + set apppath to POSIX path of choice + if application apppath is not running then -- this will flash the startcenter once... - tell application choice to activate - tell application choice to quit + tell application apppath to activate + tell application apppath to quit end if do shell script tarCommand |