From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 28 Jun 2025 13:31:46 +0000 (+0200)
Subject: man: drop inadvertently added -x, make shellcheck clean
X-Git-Tag: v257.8~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=728c50bb59b367b631d4210fd7faed4d3488f877;p=thirdparty%2Fsystemd.git

man: drop inadvertently added -x, make shellcheck clean

aecb6eaed7d39d73f296c86a882c644b18b7e634 added -x most likely for debugging,
drop it. Also, adjust quoting to make the generated scripts liked by shellcheck.

(cherry picked from commit e11041d30f7be2ea18b0ea1a95f5f7ab8c4bcae8)
---

diff --git a/man/html.in b/man/html.in
index d6822c03e08..b083e753d04 100755
--- a/man/html.in
+++ b/man/html.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 # SPDX-License-Identifier: LGPL-2.1-or-later
+
 set -e
 
 if [ -z "$1" ]; then
@@ -22,7 +23,7 @@ fi
 if [ -n "$redirect" ]; then
     ninja -C @BUILD_ROOT@ "man/$redirect"
 
-    fullname=@BUILD_ROOT@/man/"$redirect"
+    fullname=@BUILD_ROOT@"/man/$redirect"
 fi
 
 set -x
diff --git a/man/man.in b/man/man.in
index a7fee984a02..35e21db05be 100755
--- a/man/man.in
+++ b/man/man.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-set -ex
+set -e
 
 if [ -z "$1" ]; then
     echo "Use: $0 page-name (with no section suffix)"
@@ -24,7 +24,7 @@ redirect="$(sed -n -r '1 s|^\.so man[0-9]/(.*)|\1|p' "$fullname")"
 if [ -n "$redirect" ]; then
     ninja -C @BUILD_ROOT@ "man/$redirect"
 
-    fullname=@BUILD_ROOT@/man/"$redirect"
+    fullname=@BUILD_ROOT@"/man/$redirect"
 fi
 
 exec man "$fullname"