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

[Xisco Fauli (via logerrit)]

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

New commits:
commit 77699401ebfccfd8d55424d771d311639059bf4c
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Sun Feb 7 13:22:30 2021 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Mon Feb 8 10:06:19 2021 +0100

    Revert "tdf#134607 workaround – mac langpack: don't verify target location"
    
    This reverts commit d6667aec86718cc4b843a69658fcc83203d66734.
    
    Change-Id: I7632a8814814a2649cf9685f36a6146abe61a579
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110531
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript
index 3b4a116fb122..8ad55396766a 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -125,13 +125,12 @@ else
 end if	
 
 -- now only check whether the path is really from [PRODUCTNAME]
--- 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
+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