# HG changeset patch
# User Andre Heinecke <andre.heinecke@intevation.de>
# Date 1416834227 -3600
# Node ID e7a8ec3185f2f4db131d2a2f3204afcdb958d798
# Parent  8c829345ecfa6db74c3d8e7876718fcd0e66c714
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.

diff -r 8c829345ecfa -r e7a8ec3185f2 packaging/create-dist-package.sh.in
--- 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 \
diff -r 8c829345ecfa -r e7a8ec3185f2 packaging/linux-createpackage.sh.in
--- 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"