From owner-svn-src-head@freebsd.org Mon Sep 4 22:37:29 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D6C14E2290B; Mon, 4 Sep 2017 22:37:29 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A66D26481B; Mon, 4 Sep 2017 22:37:29 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v84MbSUG008566; Mon, 4 Sep 2017 22:37:28 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v84MbS4W008562; Mon, 4 Sep 2017 22:37:28 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201709042237.v84MbS4W008562@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 4 Sep 2017 22:37:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323165 - in head/release: amd64 i386 powerpc sparc64 X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head/release: amd64 i386 powerpc sparc64 X-SVN-Commit-Revision: 323165 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Sep 2017 22:37:30 -0000 Author: emaste Date: Mon Sep 4 22:37:28 2017 New Revision: 323165 URL: https://svnweb.freebsd.org/changeset/base/323165 Log: mkisoimages.sh: remove obsolete x$var convention Ancient shells had trouble with empty variables but this has not been relevant for FreeBSD for a very long time (decades?). Modified: head/release/amd64/mkisoimages.sh head/release/i386/mkisoimages.sh head/release/powerpc/mkisoimages.sh head/release/sparc64/mkisoimages.sh Modified: head/release/amd64/mkisoimages.sh ============================================================================== --- head/release/amd64/mkisoimages.sh Mon Sep 4 21:58:35 2017 (r323164) +++ head/release/amd64/mkisoimages.sh Mon Sep 4 22:37:28 2017 (r323165) @@ -23,7 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. -if [ "x$1" = "x-b" ]; then +if [ "$1" = "-b" ]; then # This is highly x86-centric and will be used directly below. bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot" Modified: head/release/i386/mkisoimages.sh ============================================================================== --- head/release/i386/mkisoimages.sh Mon Sep 4 21:58:35 2017 (r323164) +++ head/release/i386/mkisoimages.sh Mon Sep 4 22:37:28 2017 (r323165) @@ -23,7 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. -if [ "x$1" = "x-b" ]; then +if [ "$1" = "-b" ]; then # This is highly x86-centric and will be used directly below. bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot" shift Modified: head/release/powerpc/mkisoimages.sh ============================================================================== --- head/release/powerpc/mkisoimages.sh Mon Sep 4 21:58:35 2017 (r323164) +++ head/release/powerpc/mkisoimages.sh Mon Sep 4 22:37:28 2017 (r323165) @@ -23,7 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. -if [ "x$1" = "x-b" ]; then +if [ "$1" = "-b" ]; then # Apple boot code uudecode -o /tmp/hfs-boot-block.bz2 "`dirname "$0"`/hfs-boot.bz2.uu" bzip2 -d /tmp/hfs-boot-block.bz2 Modified: head/release/sparc64/mkisoimages.sh ============================================================================== --- head/release/sparc64/mkisoimages.sh Mon Sep 4 21:58:35 2017 (r323164) +++ head/release/sparc64/mkisoimages.sh Mon Sep 4 22:37:28 2017 (r323165) @@ -40,7 +40,7 @@ echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$BASEBIT makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME.tmp" "$@" rm -f "$BASEBITSDIR/etc/fstab" -if [ "x$BOPT" != "x-b" ]; then +if [ "$BOPT" != "-b" ]; then mv "$NAME.tmp" "$NAME" exit 0 fi