svn commit: r281260 - head/sys/conf

Eitan Adler eadler at FreeBSD.org
Wed Apr 8 04:01:03 UTC 2015


Author: eadler
Date: Wed Apr  8 04:01:02 2015
New Revision: 281260
URL: https://svnweb.freebsd.org/changeset/base/281260

Log:
  newvers.sh: remove 'X' hack from shell script
  
  Reviewed by:	allanjude,  Daniel O'Connor

Modified:
  head/sys/conf/newvers.sh

Modified: head/sys/conf/newvers.sh
==============================================================================
--- head/sys/conf/newvers.sh	Wed Apr  8 03:55:02 2015	(r281259)
+++ head/sys/conf/newvers.sh	Wed Apr  8 04:01:02 2015	(r281260)
@@ -33,17 +33,17 @@
 TYPE="FreeBSD"
 REVISION="11.0"
 BRANCH="CURRENT"
-if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
+if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"
 
-if [ "X${SYSDIR}" = "X" ]; then
+if [ -z "${SYSDIR}" ]; then
     SYSDIR=$(dirname $0)/..
 fi
 
-if [ "X${PARAMFILE}" != "X" ]; then
+if [ -n "${PARAMFILE}" ]; then
 	RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \
 		${PARAMFILE})
 else
@@ -72,7 +72,7 @@ do
 done
 
 # no copyright found, use a dummy
-if [ X"$COPYRIGHT" = X ]; then
+if [ -z "$COPYRIGHT" ]; then
 	COPYRIGHT="/*-
  * Copyright (c) 1992-$year The FreeBSD Project.
  * All rights reserved.


More information about the svn-src-all mailing list