tor

commit 2dab7a10780db1047bda4e18c2d308274744e806
parent 7741b21d0e3afbfc6d60a852fce6992724c4ae71
Author: teor <teor@torproject.org>
Date:   Tue,  9 Apr 2019 11:36:12 +1000

Merge remote-tracking branch 'tor-github/pr/862'

Diffstat:
A
changes/bug29926
 | 
2
++
M
doc/asciidoc-helper.sh
 | 
6
+++---

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/changes/bug29926 b/changes/bug29926
@@ -0,0 +1,2 @@
+  o Code simplification and refactoring (shell scripts):
+    - Fix shellcheck warnings in asciidoc-helper.sh. Resolves issue 29926.
diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh
@@ -19,7 +19,7 @@ if [ "$1" = "html" ]; then
     base=${output%%.html.in}
 
     if [ "$2" != none ]; then
-      TZ=UTC "$2" -d manpage -o $output $input;
+      TZ=UTC "$2" -d manpage -o "$output" "$input";
     else
       echo "==================================";
       echo;
@@ -44,8 +44,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
 ==================================