From 1184a0130e7f340093a4bc0de032ebea1866b467 Mon Sep 17 00:00:00 2001 From: Patrick Luby Date: Fri, 21 Jul 2023 08:51:02 -0400 Subject: [PATCH] tdf#144053 Compare version to ProductKey entry in bootstraprc Using the mdls command fails if macOS Spotlight is disabled for the path selected by the user. So, instead, check if the path contains a matching "ProductKey=" line in its Contents/Resources/bootstraprc file. Change-Id: Idbf8e2712b9fae8efa0997cf5c5c0f3fa6e68658 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154718 Tested-by: Jenkins Reviewed-by: Heiko Tietze Reviewed-by: Patrick Luby --- setup_native/scripts/osx_install_languagepack.applescript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript index 4083b01cd97c..270082396125 100644 --- a/setup_native/scripts/osx_install_languagepack.applescript +++ b/setup_native/scripts/osx_install_languagepack.applescript @@ -126,9 +126,9 @@ end if -- now only check whether the path is really from [PRODUCTNAME] try - do shell script "mdls --raw --name kMDItemFSName --name kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 | fgrep '[PRODUCTNAME].app [PRODUCTVERSION]'" + do shell script "grep '^ProductKey=[PRODUCTNAME] [PRODUCTVERSION]$' " & quoted form of (choice as string) & "/Contents/Resources/bootstraprc" on error - display dialog (choice as string) & appInvalid buttons {InstallLabel} default button 1 with icon 0 + display dialog (choice as string) & " " & appInvalid buttons {OKLabel} default button 1 with icon 0 return 3 --wrong target-directory end try