summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-04-09 11:36:12 +1000
committerteor <teor@torproject.org>2019-04-09 11:36:12 +1000
commit2dab7a10780db1047bda4e18c2d308274744e806 (patch)
tree20c0992382af3cdb3c656fcc267cd527502faedc
parent7741b21d0e3afbfc6d60a852fce6992724c4ae71 (diff)
parent283ee0ba0a1540a9e8e8d68625d89315a5356162 (diff)
downloadtor-2dab7a10780db1047bda4e18c2d308274744e806.tar.gz
tor-2dab7a10780db1047bda4e18c2d308274744e806.zip
Merge remote-tracking branch 'tor-github/pr/862'
-rw-r--r--changes/bug299262
-rwxr-xr-xdoc/asciidoc-helper.sh6
2 files changed, 5 insertions, 3 deletions
diff --git a/changes/bug29926 b/changes/bug29926
new file mode 100644
index 0000000000..ab1417c603
--- /dev/null
+++ 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
index a3ef53f884..765850a125 100755
--- 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
==================================