setlocalversion: simplify the construction of the short version

masahir0y · masahir0y · commit 992ebfab2a75 · 2023-02-05T18:34:11.000+09:00
With the --short option given, scm_version() prints "+".
Just append it.

Signed-off-by: Masahiro Yamada &lt;masahiroy@kernel.org&gt;
Reviewed-by: Nicolas Schier &lt;nicolas@fjasle.eu&gt;
diff --git 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"

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,7 @@ elif [ "${LOCALVERSION+set}" != "set" ]; then`
`121`	`121`	`#`
`122`	`122`	`# If the variable LOCALVERSION is set (including being set`
`123`	`123`	`# to an empty string), we don't want to append a plus sign.`
`124`		`- scm=$(scm_version --short)`
`125`		`- res="$res${scm:++}"`
	`124`	`+ res="$res$(scm_version --short)"`
`126`	`125`	`fi`
`127`	`126`
`128`	`127`	`echo "$res"`