[PATCH 2/7] setlocalversion: simplify the construction of the short version

From: Masahiro Yamada
Date: Sun Jan 22 2023 - 09:14:44 EST


With the --short option given, scm_version() prints "+".
Just append it.

Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
---

scripts/setlocalversion | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 3b31702b4a4a..5cdf409204aa 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -121,8 +121,7 @@ elif [ "${LOCALVERSION+set}" != "set" ]; then
#
# If the variable LOCALVERSION is set (including being set
# to an empty string), we don't want to append a plus sign.
- scm=$(scm_version --short)
- res="$res${scm:++}"
+ res="$res$(scm_version --short)"
fi

echo "$res"
--
2.34.1