From f6b3382fa3cf988e7e80d0cab14393d4f9ec2113 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Wed, 4 Oct 2017 19:58:51 +0200 Subject: Remove unused variables --- contrib/verify-commits/verify-commits.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 'contrib/verify-commits') diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh index 7194b040eb..85661f4670 100755 --- a/contrib/verify-commits/verify-commits.sh +++ b/contrib/verify-commits/verify-commits.sh @@ -12,8 +12,6 @@ VERIFIED_ROOT=$(cat "${DIR}/trusted-git-root") VERIFIED_SHA512_ROOT=$(cat "${DIR}/trusted-sha512-root-commit") REVSIG_ALLOWED=$(cat "${DIR}/allow-revsig-commits") -HAVE_FAILED=false - HAVE_GNU_SHA512=1 [ ! -x "$(which sha512sum)" ] && HAVE_GNU_SHA512=0 -- cgit v1.2.3 From 80f5f28d38e59b550ab7e7465cfa48defee343a6 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Wed, 4 Oct 2017 21:25:25 +0200 Subject: Fix incorrect quoting of quotes (the previous quotes had no effect beyond unquoting) --- contrib/verify-commits/verify-commits.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/verify-commits') diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh index 85661f4670..98ee243ea7 100755 --- a/contrib/verify-commits/verify-commits.sh +++ b/contrib/verify-commits/verify-commits.sh @@ -36,7 +36,7 @@ PREV_COMMIT="" while true; do if [ "$CURRENT_COMMIT" = $VERIFIED_ROOT ]; then - echo "There is a valid path from "$CURRENT_COMMIT" to $VERIFIED_ROOT where all commits are signed!" + echo "There is a valid path from \"$CURRENT_COMMIT\" to $VERIFIED_ROOT where all commits are signed!" exit 0 fi -- cgit v1.2.3 From 683b9d280bba7a0f0f78818e5e29a21cef2eb5e6 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Mon, 9 Oct 2017 23:20:52 +0200 Subject: Fix valid path output --- contrib/verify-commits/verify-commits.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'contrib/verify-commits') diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh index 98ee243ea7..9ba01791a8 100755 --- a/contrib/verify-commits/verify-commits.sh +++ b/contrib/verify-commits/verify-commits.sh @@ -33,10 +33,11 @@ fi NO_SHA1=1 PREV_COMMIT="" +INITIAL_COMMIT=${CURRENT_COMMIT} while true; do if [ "$CURRENT_COMMIT" = $VERIFIED_ROOT ]; then - echo "There is a valid path from \"$CURRENT_COMMIT\" to $VERIFIED_ROOT where all commits are signed!" + echo "There is a valid path from \"$INITIAL_COMMIT\" to $VERIFIED_ROOT where all commits are signed!" exit 0 fi -- cgit v1.2.3 From 13a81b19df7acff51187655bb755f1371f9c83ca Mon Sep 17 00:00:00 2001 From: practicalswift Date: Wed, 18 Oct 2017 07:34:25 +0200 Subject: Add quotes to variable assignment (as requested by @TheBlueMatt) --- contrib/verify-commits/verify-commits.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/verify-commits') diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh index 9ba01791a8..78320a4ce3 100755 --- a/contrib/verify-commits/verify-commits.sh +++ b/contrib/verify-commits/verify-commits.sh @@ -33,7 +33,7 @@ fi NO_SHA1=1 PREV_COMMIT="" -INITIAL_COMMIT=${CURRENT_COMMIT} +INITIAL_COMMIT="${CURRENT_COMMIT}" while true; do if [ "$CURRENT_COMMIT" = $VERIFIED_ROOT ]; then -- cgit v1.2.3