[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/maint-0.4.6] shellcheck: Make it happy on couple scripts
commit 1902edaf52b66145b0222c6586c2acb9d71980f0
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date: Wed Nov 3 09:47:30 2021 -0400
shellcheck: Make it happy on couple scripts
Signed-off-by: David Goulet <dgoulet@xxxxxxxxxxxxxx>
---
doc/asciidoc-helper.sh | 9 +++++----
scripts/ci/ci-driver.sh | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh
index 2b63154441..3706ca2e14 100755
--- a/doc/asciidoc-helper.sh
+++ b/doc/asciidoc-helper.sh
@@ -12,7 +12,8 @@ if [ $# != 3 ]; then
exit 1;
fi
-export SOURCE_DATE_EPOCH=$(git show --no-patch --format='%ct')
+SOURCE_DATE_EPOCH="$(git show --no-patch --format='%ct')"
+export SOURCE_DATE_EPOCH
output=$3
@@ -21,7 +22,7 @@ if [ "$1" = "html" ]; then
base=${output%%.html.in}
if [ "$2" != none ]; then
- TZ=UTC "$2" -f "$(dirname $0)/nofooter.conf" -d manpage -o "$output" "$input";
+ TZ=UTC "$2" -f "$(dirname "$0")/nofooter.conf" -d manpage -o "$output" "$input";
else
echo "==================================";
echo;
@@ -46,8 +47,8 @@ elif [ "$1" = "man" ]; then
echo "==================================";
exit 1;
fi
- if "$2" -f manpage $input; then
- mv $base.1 $output;
+ if "$2" -f manpage "$input"; then
+ mv "$base.1" "$output";
else
cat<<EOF
==================================
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index f99e45e6f2..61f97a91d4 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -287,7 +287,7 @@ fi
#############################################################################
# Determine the version of Tor.
-TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; s/\].*//;')
+TOR_VERSION=$(grep -m 1 AC_INIT "${CI_SRCDIR}"/configure.ac | sed -e 's/.*\[//; s/\].*//;')
# Use variables like these when we need to behave differently depending on
# Tor version. Only create the variables we need.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits