From 992c1de725dd7590f63044ce2f1c5337fd271d9a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 20 Nov 2020 01:02:02 +0200 Subject: Check first if there is such a "bin" directory before attempting to use it In the test-install target in Makefile.in we remove the "bin" folder of the LibreOfficePython framework. Change-Id: Idf3d440c4f9465f21b5dcae60d4fc5ac21965dd8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106284 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106398 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107251 Reviewed-by: Michael Stahl --- solenv/bin/macosx-codesign-app-bundle | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle index 2353032e3a8a..8aa725745327 100755 --- a/solenv/bin/macosx-codesign-app-bundle +++ b/solenv/bin/macosx-codesign-app-bundle @@ -99,10 +99,12 @@ while read framework; do if test ! -L "$version" -a -d "$version"; then # Assume the framework has a XML (and not binary) Info.plist id=`grep -A 1 'CFBundleIdentifier' $version/Resources/Info.plist | tail -1 | sed -e 's,.*,,' -e 's,.*,,'` - # files in bin are not covered by signing the framework... - for scriptorexecutable in $(find $version/bin/ -type f); do - codesign --verbose --options=runtime --force --identifier=$id --sign "$MACOSX_CODESIGNING_IDENTITY" "$scriptorexecutable" >> "/tmp/codesign_${fn}.log" 2>&1 - done + if test -d $version/bin; then + # files in bin are not covered by signing the framework... + for scriptorexecutable in $(find $version/bin/ -type f); do + codesign --verbose --options=runtime --force --identifier=$id --sign "$MACOSX_CODESIGNING_IDENTITY" "$scriptorexecutable" >> "/tmp/codesign_${fn}.log" 2>&1 + done + fi codesign --verbose --force --identifier=$id --sign "$MACOSX_CODESIGNING_IDENTITY" "$version" >> "/tmp/codesign_${fn}.log" 2>&1 if [ "$?" != "0" ] ; then exit 1 -- cgit