`git push` needs a little more help

Also simplify creation of VersionNum a little

Version 0.32. Tagged as 'builder-0_32'

.gitlab-ci.yml

@@ -13,6 +13,7 @@ deploy:
     # tip of master to ensure consistency.
     - git checkout origin/master
     - SOURCETAG=$(git describe --abbrev=8 --tags --always)
+    - BRANCH=Import$(echo $SOURCETAG | sed -e 's/[-._]//g')
     # As soon as the CI stuff is merged into the central project, update group and branch identifiers.
     - 'curl --location --output RiscOS.zip "https://gitlab.riscosopen.org/bavison/BuildHost/-/jobs/artifacts/ci/download?job=latest_package_tree"'
     - unzip -q RiscOS.zip
@@ -28,4 +29,4 @@ deploy:
     # - otherwise, create a VersionNum file that is 0.01 behind the source
     #   component, and let the srccommit instance that runs during the merge
     #   bring the source and binary versions back to parity
-    - cd PlingBuilder && git diff --quiet --exit-code || ( git checkout -b Import$(echo $SOURCETAG | sed -e 's/[-._]//g'); if diff <(head -1 ../VersionNum) <(head -1 VersionNum) &> /dev/null; then git add .; git commit --author="ROOL <code@riscosopen.org>" -m "Binary import from source version "$SOURCETAG$'\n!NoTag'; else NEXTVER=$(sed $'1s/^.*(\\(.*\\)).*$/\\1/;t\nd' ../VersionNum); INTVER=${NEXTVER%%.*}; FRACVER=${NEXTVER#*.}; FRACVER=${FRACVER#0}; if [ $FRACVER = 0 ]; then INTVER=$((INTVER-1)); FRACVER=99; else FRACVER=$((FRACVER-1)); fi; PREVER=$(printf "%d.%02d" $INTVER $FRACVER); echo "($PREVER)" > VersionNum; git add .; git commit --author="ROOL <code@riscosopen.org>" -m "Binary import from source version "$SOURCETAG; fi; git push -o merge_request.create origin )
+    - cd PlingBuilder && git diff --quiet --exit-code || ( git checkout -b $BRANCH; if diff <(head -1 ../VersionNum) <(head -1 VersionNum) &> /dev/null; then git add .; git commit -m "Binary import from source version "$SOURCETAG$'\n!NoTag'; else NEXTVER=$(sed $'1s/^.*(\\(.*\\)).*$/\\1/;t\nd' ../VersionNum); INTVER=${NEXTVER%%.*}; FRACVER=${NEXTVER#*.}; FRACVER=${FRACVER#0}; if [ $FRACVER = 0 ]; then INTVER=$((INTVER-1)); FRACVER=99; else FRACVER=$((FRACVER-1)); fi; printf "(%d.%02d)" $INTVER $FRACVER > VersionNum; git add .; git commit -m "Binary import from source version "$SOURCETAG; fi; git push -o merge_request.create origin $BRANCH )

VersionNum

-/* (0.31)
+/* (0.32)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        0.31
+#define Module_MajorVersion_CMHG        0.32
 #define Module_MinorVersion_CMHG
 #define Module_Date_CMHG                08 Apr 2020
 
-#define Module_MajorVersion             "0.31"
-#define Module_Version                  31
+#define Module_MajorVersion             "0.32"
+#define Module_Version                  32
 #define Module_MinorVersion             ""
 #define Module_Date                     "08 Apr 2020"
 
@@ -16,6 +16,6 @@
 
 #define Module_ComponentName            "builder"
 
-#define Module_FullVersion              "0.31"
-#define Module_HelpVersion              "0.31 (08 Apr 2020)"
-#define Module_LibraryVersionInfo       "0:31"
+#define Module_FullVersion              "0.32"
+#define Module_HelpVersion              "0.32 (08 Apr 2020)"
+#define Module_LibraryVersionInfo       "0:32"