summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2021-03-12 12:25:30 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2021-03-17 11:04:02 +0100
commit00ce3c5c8238035dc0c470e54f055b2406bffd64 (patch)
tree394965dcc6fe75bf2f30749dc2613c3f9df3b913 /setup_native
parentcf453e399c94f3af49a614c266f7c2e9a1ad45fa (diff)
tdf#134607 use kMDItemFSName instead of _kMDItemDisplayNameWithExtensions
apparently the latter is not available on older versions of macOS. https://developer.apple.com/documentation/coreservices/kmditemfsname lists it as in version 10.4 and not flagged as deprecated, so keeping fingers crossed that it is not affected by user-settings or similar… Change-Id: I208d22f2abd628e7d95babc23ddb145a88bcf5cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112385 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit daa162c20f4c7d61edc217ed44cb2854652a63ec) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112528 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/scripts/osx_install_languagepack.applescript4
1 files changed, 2 insertions, 2 deletions
diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript
index bc793a510c8d..4083b01cd97c 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' && _kMDItemDisplayNameWithExtensions == '[PRODUCTNAME].app'\"")
+ set found_ooos_all to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemFSName == '[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 _kMDItemDisplayNameWithExtensions --name kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 | fgrep '[PRODUCTNAME].app [PRODUCTVERSION]'"
+ do shell script "mdls --raw --name kMDItemFSName --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