Date: Mon, 4 Sep 2017 22:37:28 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> 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 Message-ID: <201709042237.v84MbS4W008562@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709042237.v84MbS4W008562>