Mercurial > trustbridge > trustbridge
changeset 1367:e7a8ec3185f2
Add nosign option to linux-createpackage and use it in create-dist-package
This should prevent doubled signatures in distributed packages which
were first signed on the development system with the test key and
then from the administrator application.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Mon, 24 Nov 2014 14:03:47 +0100 |
| parents | 8c829345ecfa |
| children | 41cf49df007d |
| files | packaging/create-dist-package.sh.in packaging/linux-createpackage.sh.in |
| diffstat | 2 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/packaging/create-dist-package.sh.in Mon Nov 24 12:40:49 2014 +0100 +++ b/packaging/create-dist-package.sh.in Mon Nov 24 14:03:47 2014 +0100 @@ -36,10 +36,10 @@ cd @CMAKE_SOURCE_DIR@/build-i386 echo "Building x86 package" make -j`nproc` -/bin/bash packaging/linux-createpackage.sh i386 +/bin/bash packaging/linux-createpackage.sh i386 nosign cd @CMAKE_BINARY_DIR@ echo "Building amd64 package" -/bin/bash packaging/linux-createpackage.sh x86_64 +/bin/bash packaging/linux-createpackage.sh x86_64 nosign mkdir -p $TMPDIR/linux mkdir -p $TMPDIR/windows mv @CMAKE_BINARY_DIR@/TrustBridge-@PROJECT_VERSION@.sh \
--- a/packaging/linux-createpackage.sh.in Mon Nov 24 12:40:49 2014 +0100 +++ b/packaging/linux-createpackage.sh.in Mon Nov 24 14:03:47 2014 +0100 @@ -124,12 +124,15 @@ sed -i "/###SHAR###/r $TMPSHAR" "$INSTALLER" -echo "Signing" -"@CMAKE_SOURCE_DIR@/ui/tests/append-sig.sh" \ - "@CMAKE_SOURCE_DIR@/ui/tests/data/codesign/codesigning.key" \ - "$INSTALLER" "${INSTALLER}_signed" -mv "${INSTALLER}_signed" "$INSTALLER" - +if [ "$2" != "nosign" ]; then + echo "Signing" + "@CMAKE_SOURCE_DIR@/ui/tests/append-sig.sh" \ + "@CMAKE_SOURCE_DIR@/ui/tests/data/codesign/codesigning.key" \ + "$INSTALLER" "${INSTALLER}_signed" + mv "${INSTALLER}_signed" "$INSTALLER" +else + echo "Skipping sign step." +fi echo "Cleaning up..." rm -r "$TMPDIR" rm "$TMPSHAR"