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

[Christian Lohmaier (via logerrit)]

 setup_native/scripts/osx_install_languagepack.applescript |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit d6667aec86718cc4b843a69658fcc83203d66734
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Mon Sep 7 18:14:03 2020 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Mon Sep 7 18:14:03 2020 +0200

    tdf#134607 workaround – mac langpack: don't verify target location
    
    for some reason the commands used don't work for some users
    
    Change-Id: Iecd5ffdfcb5c7d8cd5c4202fed0906ebf1ef68f9

diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript
index 8ad55396766a..3b4a116fb122 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -125,12 +125,13 @@ else
 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]'"
-on error
-	display dialog (choice as string) & appInvalid buttons {InstallLabel} default button 1 with icon 0
-	return 3 --wrong target-directory
-end try
+-- 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
 
 (*
 display dialog startInstall buttons {AbortLabel, InstallLabel} default button 2