[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - solenv/bin

[Tor Lillqvist (via logerrit)]

 solenv/bin/macosx-codesign-app-bundle |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 5893f56dc318d00385f7e201731ba3cf61c79e45
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 20 01:02:02 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 20 17:57:12 2020 +0100

    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 <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle
index 756ae3fd7705..7a3d0e673258 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -100,10 +100,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 '<key>CFBundleIdentifier</key>' "$version/Resources/Info.plist" | tail -1 | sed -e 's,.*<string>,,' -e 's,</string>.*,,'`
-            # 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