diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-02-07 13:22:30 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-02-08 10:06:19 +0100 |
| commit | 77699401ebfccfd8d55424d771d311639059bf4c (patch) | |
| tree | c401a3d69a7a25ea7bc116b103abaa85b97ae9f7 | |
| parent | 2a27ff2190a40afe806bbf3577b641390047e209 (diff) | |
Revert "tdf#134607 workaround – mac langpack: don't verify target location"
This reverts commit d6667aec86718cc4b843a69658fcc83203d66734.
Change-Id: I7632a8814814a2649cf9685f36a6146abe61a579
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110531
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | setup_native/scripts/osx_install_languagepack.applescript | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript index 3b4a116fb122..8ad55396766a 100644 --- a/setup_native/scripts/osx_install_languagepack.applescript +++ b/setup_native/scripts/osx_install_languagepack.applescript @@ -125,13 +125,12 @@ else end if -- now only check whether the path is really from [PRODUCTNAME] --- FIXME: https://bugs.documentfoundation.org/show_bug.cgi?id=134607 --- try --- do shell script "mdls --raw --name kMDItemDisplayName --name kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 | fgrep '[PRODUCTNAME] [PRODUCTVERSION]'" --- on error --- display dialog (choice as string) & appInvalid buttons {InstallLabel} default button 1 with icon 0 --- return 3 --wrong target-directory --- end try +try + do shell script "mdls --raw --name kMDItemDisplayName --name kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 | fgrep '[PRODUCTNAME] [PRODUCTVERSION]'" +on error + display dialog (choice as string) & appInvalid buttons {InstallLabel} default button 1 with icon 0 + return 3 --wrong target-directory +end try (* display dialog startInstall buttons {AbortLabel, InstallLabel} default button 2 |