[Libreoffice-commits] core.git: Branch 'libreoffice-7-1-2' - setup_native/scripts

[Christian Lohmaier (via logerrit)]

 setup_native/scripts/osx_install_languagepack.applescript |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 40ae5790249811b38f6fafbda5f1396fdb12e996
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Fri Mar 12 12:25:30 2021 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Mar 17 17:52:29 2021 +0100

    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 at googlemail.com>
    (cherry picked from commit daa162c20f4c7d61edc217ed44cb2854652a63ec)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112527
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    (cherry picked from commit 78f69c686c9f8b40fbd183dde71e94d4d7a729ab)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112614
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

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