Commit 03008e7a authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Matevz Golob

fix "caddy-frontend: Do not emit garbage during validation"

Stderr to null redirection happened in the wrong place.
parent 0a098beb
...@@ -94,11 +94,11 @@ md5sum = b9f73f6323f9fceea054c46c854d2862 ...@@ -94,11 +94,11 @@ md5sum = b9f73f6323f9fceea054c46c854d2862
[template-graceful-script] [template-graceful-script]
filename = templates/graceful-script.sh.in filename = templates/graceful-script.sh.in
md5sum = 2c5f15b3906dc64a76d7e88d6dee8dfe md5sum = 959f49437cffb096368f0b6434f06d3d
[template-validate-script] [template-validate-script]
filename = templates/validate-script.sh.in filename = templates/validate-script.sh.in
md5sum = a23831f38b7d3aca6639e12f115f4a79 md5sum = 3174bf29f439d14e292f8719bba19a7a
[caddyprofiledeps-setup] [caddyprofiledeps-setup]
filename = setup.py filename = setup.py
......
...@@ -4,7 +4,7 @@ SIGNATURE_FILE={{ signature_file }} ...@@ -4,7 +4,7 @@ SIGNATURE_FILE={{ signature_file }}
NSIGNATURE_FILE={{ signature_file }}.tmp NSIGNATURE_FILE={{ signature_file }}.tmp
touch $SIGNATURE_FILE touch $SIGNATURE_FILE
{{ sha256sum }} {{ path_list }} | sort -k 66 > $NSIGNATURE_FILE 2> /dev/null {{ sha256sum }} {{ path_list }} 2> /dev/null | sort -k 66 > $NSIGNATURE_FILE
# If no diff, no restart for now # If no diff, no restart for now
if diff "$SIGNATURE_FILE" "$NSIGNATURE_FILE" > /dev/null ; then if diff "$SIGNATURE_FILE" "$NSIGNATURE_FILE" > /dev/null ; then
......
...@@ -7,7 +7,7 @@ NSIGNATURE_FILE={{ signature_file }}.tmp ...@@ -7,7 +7,7 @@ NSIGNATURE_FILE={{ signature_file }}.tmp
SIGNATURE_STATUS={{ signature_file }}.status SIGNATURE_STATUS={{ signature_file }}.status
touch $SIGNATURE_FILE touch $SIGNATURE_FILE
{{ sha256sum }} {{ path_list }} | sort -k 66 > $NSIGNATURE_FILE 2> /dev/null {{ sha256sum }} {{ path_list }} 2> /dev/null | sort -k 66 > $NSIGNATURE_FILE
if diff "$SIGNATURE_FILE" "$NSIGNATURE_FILE" > /dev/null; then if diff "$SIGNATURE_FILE" "$NSIGNATURE_FILE" > /dev/null; then
rm -f "$NSIGNATURE_FILE" rm -f "$NSIGNATURE_FILE"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment