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

[Christian Lohmaier (via logerrit)]

 setup_native/scripts/osx_install_languagepack.applescript |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 79cac857a925605c3964b58b68a8a89b12c0f32c
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Tue Jun 16 11:14:14 2020 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Jun 16 16:08:15 2020 +0200

    mac langpack script: simplify mdfind call to not use wildcard match
    
    I think this is leftover from very early development stages when it
    didn't have placeholders, but literal OpenOffice or similar at the time.
    
    Not matching for wildcard but for full LibreOffice/LibreOfficeDev string
    makes removing the languagepacks from the match superfluous
    
    It was wrong anyway, since kMDItemDisplayName has the name without the
    .app extension (you'd have to use _kMDItemDisplayNameWithExtensions for
    that)
    
    Change-Id: I37b1ed2d23ea18fd81a8844f35c9cb0d5dc34211
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96441
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    (cherry picked from commit 9da104538dd92861b2b9e4e95ccbafe12632fe83)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96423

diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript
index f5cd0dc6ac8f..5f0bdbd43987 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]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"")
+	set found_ooos_all to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]'\"")
 end try
 set found_ooos_all to found_ooos_all & "
 " & chooseMyOwn