Include SHA1 in version string for nightly GCCrs/static ananlysis builds

Helps with tracking bugs when version string displays:

 gcc (Compiler-Explorer-Build-99b73780e6e30f962c01532d3ec189ceeecf7f93) 11.0.1 20210325 (experimental)

Also bump Major version used for local patch (currently none) for GCCrs as it's
based on pre-11 release.

Add quotes to have shellcheck happy.

build/build.sh

@@ -52,13 +52,15 @@ elif echo "${VERSION}" | grep 'static-analysis-trunk'; then
     MAJOR_MINOR=10-trunk
     LANGUAGES=c,c++
     PLUGINS=analyzer
+    INCLUDE_SHA1_IN_VERSION_STRING=yes
 elif echo "${VERSION}" | grep 'gccrs-master'; then
     VERSION=gccrs-master-$(date +%Y%m%d)
     URL=https://github.com/Rust-GCC/gccrs.git
     BRANCH=master
-    MAJOR=10
-    MAJOR_MINOR=10-trunk
+    MAJOR=11
+    MAJOR_MINOR=11-trunk
     LANGUAGES=rust
+    INCLUDE_SHA1_IN_VERSION_STRING=yes
 elif echo "${VERSION}" | grep 'trunk'; then
     VERSION=trunk-$(date +%Y%m%d)
     URL=git://gcc.gnu.org/git/gcc.git
@@ -90,10 +92,15 @@ if [[ "${BINUTILS_VERSION}" == "trunk" ]]; then
     BINUTILS_NEEDS_GMP=yes
 fi
 
-GCC_REVISION=$(git ls-remote --heads ${URL} refs/heads/${BRANCH} | cut -f 1)
+GCC_REVISION=$(git ls-remote --heads ${URL} "refs/heads/${BRANCH}" | cut -f 1)
 REVISION="gcc-${GCC_REVISION}-binutils-${BINUTILS_REVISION}"
 LAST_REVISION="${3}"
 
+PKGVERSION="Compiler-Explorer-Build"
+if [[ -n "${INCLUDE_SHA1_IN_VERSION_STRING}" ]]; then
+    PKGVERSION+="-${GCC_REVISION}"
+fi
+
 echo "ce-build-revision:${REVISION}"
 
 if [[ "${REVISION}" == "${LAST_REVISION}" ]]; then
@@ -163,7 +170,7 @@ CONFIG+=" --enable-linker-build-id"
 CONFIG+=" --enable-lto"
 CONFIG+=" --enable-plugins"
 CONFIG+=" --enable-threads=posix"
-CONFIG+=" --with-pkgversion=Compiler-Explorer-Build"
+CONFIG+=" --with-pkgversion=\"${PKGVERSION}\""
 # The static analyzer branch adds a --enable-plugins configuration option
 if [[ -n "${PLUGINS}" ]]; then
     CONFIG+=" --enable-plugins=${PLUGINS}"