svn commit: r365839 - releng/12.2/sys/conf

[Glen Barber]

Author: gjb
Date: Thu Sep 17 16:31:19 2020
New Revision: 365839
URL: https://svnweb.freebsd.org/changeset/base/365839

Log:
  MFS12 r365838:
   MFC r365646, r365720:
   r365646:
    Enclose BRANCH_OVERRIDE in quotes in order to fix an issue with
    freebsd-update(8) builds, where BRANCH is suffixed with -p0 for
    builds.
  
   r365720 (gordon):
    Partially revert r346018 and use the if/then construct instead of
    shell.
  
  Approved by:	re (kib)
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

Modified:
  releng/12.2/sys/conf/newvers.sh
Directory Properties:
  releng/12.2/   (props changed)

Modified: releng/12.2/sys/conf/newvers.sh
==============================================================================
--- releng/12.2/sys/conf/newvers.sh	Thu Sep 17 16:09:38 2020	(r365838)
+++ releng/12.2/sys/conf/newvers.sh	Thu Sep 17 16:31:19 2020	(r365839)
@@ -49,7 +49,10 @@
 
 TYPE="FreeBSD"
 REVISION="12.2"
-BRANCH=${BRANCH_OVERRIDE:-BETA1-p1}
+BRANCH="BETA1-p1"
+if [ -n "${BRANCH_OVERRIDE}" ]; then
+	BRANCH=${BRANCH_OVERRIDE}
+fi
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"