setup_native/scripts/osx_install_languagepack.applescript | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dbaf1d75601cb911d1c17e1e63d2c7047f2cf9e1
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri Feb 5 15:22:19 2021 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Feb 5 15:30:26 2021 +0100
tdf#134607 mac-langpacks: always query for full name with extension
kMDItemDisplayName has different values depending on the setting whether
to show extensions for all filetypes in Finder, breaking the
detection/validation of the installation target in case the user doesn't
use the default setting.
Change-Id: Ic9605abaaa1f070f1f5ec9940190fd1dd2555bdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110479
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/setup_native/scripts/osx_install_languagepack.applescript
b/setup_native/scripts/osx_install_languagepack.applescript
index 8ad55396766a..bc793a510c8d 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -66,7 +66,7 @@ end if
set found_ooos_all to ""
-- command might return an error if spotlight is disabled completely
try
- set found_ooos_all to (do shell script "mdfind \"kMDItemContentType ==
'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]'\"")
+ set found_ooos_all to (do shell script "mdfind \"kMDItemContentType ==
'com.apple.application-bundle' && _kMDItemDisplayNameWithExtensions ==
'[PRODUCTNAME].app'\"")
end try
set found_ooos_all to found_ooos_all & "
" & chooseMyOwn
@@ -126,7 +126,7 @@ end if
-- now only check whether the path is really from [PRODUCTNAME]
try
- do shell script "mdls --raw --name kMDItemDisplayName --name
kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 | fgrep
'[PRODUCTNAME] [PRODUCTVERSION]'"
+ do shell script "mdls --raw --name _kMDItemDisplayNameWithExtensions
--name kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 |
fgrep '[PRODUCTNAME].app [PRODUCTVERSION]'"
on error
display dialog (choice as string) & appInvalid buttons {InstallLabel}
default button 1 with icon 0
return 3 --wrong target-directory
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
