From 3ce756b6923d2a8c8784879c60ce0b31364c2c64 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 3 Jul 2016 13:53:20 +0200 Subject: [PATCH] add set -e to shell scripts --- bootloader-docker-build.sh | 2 ++ firmware-docker-build.sh | 2 ++ firmware-fingerprint.sh | 1 + firmware/u2f/genkeys.sh | 9 +++++---- 4 files changed, 10 insertions(+), 4 deletions(-) mode change 100644 => 100755 firmware/u2f/genkeys.sh diff --git a/bootloader-docker-build.sh b/bootloader-docker-build.sh index 636a095aa..d25e7e023 100755 --- a/bootloader-docker-build.sh +++ b/bootloader-docker-build.sh @@ -1,4 +1,6 @@ #!/bin/bash +set -e + IMAGETAG=trezor-mcu-build FIRMWARETAG=${1:-master} diff --git a/firmware-docker-build.sh b/firmware-docker-build.sh index cd95ac5b7..2b32c6c7b 100755 --- a/firmware-docker-build.sh +++ b/firmware-docker-build.sh @@ -1,4 +1,6 @@ #!/bin/bash +set -e + IMAGETAG=trezor-mcu-build FIRMWARETAG=${1:-master} diff --git a/firmware-fingerprint.sh b/firmware-fingerprint.sh index 0157467cc..3e48bcdb0 100755 --- a/firmware-fingerprint.sh +++ b/firmware-fingerprint.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e if [ -z "$1" ]; then echo "Please provide filename as argument" diff --git a/firmware/u2f/genkeys.sh b/firmware/u2f/genkeys.sh old mode 100644 new mode 100755 index 3bc7e5b10..33371d5be --- a/firmware/u2f/genkeys.sh +++ b/firmware/u2f/genkeys.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e cat > u2f_keys.h <) { + perl -e '$key = "\t"; while (<>) { if (/priv:/) { $priv = 1 } elsif (/pub:/) { $priv = 0 } elsif ($priv) { while ($_ =~ s/.*?([0-9a-f]{2})//) { - $key .= "0x$1,"; - if ($num++ % 8 == 7) { $key .= "\n\t"; } + $key .= "0x$1,"; + if ($num++ % 8 == 7) { $key .= "\n\t"; } else {$key .= " ";} } } @@ -32,7 +33,7 @@ cat >> u2f_keys.h <> u2f_keys.h