With the --short option given, scm_version() prints "+". Just append it.
Unified · Split
| @@ -121,8 +121,7 @@ elif [ "${LOCALVERSION+set}" != "set" ]; then · 120 unmodified lines | |||
| 121 | # | 121 | # |
| 122 | # If the variable LOCALVERSION is set (including being set | 122 | # If the variable LOCALVERSION is set (including being set |
| 123 | # to an empty string), we don't want to append a plus sign. | 123 | # to an empty string), we don't want to append a plus sign. |
| 124 | scm=$(scm_version --short) | 124 | res="$res$(scm_version --short)" |
| 125 | res="$res${scm:++}" | ||
| 126 | fi | 125 | fi |
| 127 | 126 | ||
| 128 | echo "$res" | 127 | echo "$res" |