Date: Mon, 21 Dec 2015 05:08:20 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292529 - head/tools/tools/nanobsd/embedded Message-ID: <201512210508.tBL58KD8013631@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Dec 21 05:08:20 2015 New Revision: 292529 URL: https://svnweb.freebsd.org/changeset/base/292529 Log: There's no such program as [-n :(. Add the missing space. Also, work when the object directory doesn't exist yet. realpath hates us, so use the backup of the realpath arg when that happens. Modified: head/tools/tools/nanobsd/embedded/common Modified: head/tools/tools/nanobsd/embedded/common ============================================================================== --- head/tools/tools/nanobsd/embedded/common Mon Dec 21 04:42:58 2015 (r292528) +++ head/tools/tools/nanobsd/embedded/common Mon Dec 21 05:08:20 2015 (r292529) @@ -86,7 +86,7 @@ NANO_CFG_BASE=$(pwd) NANO_CFG_BASE=$(realpath ${NANO_CFG_BASE}/..) NANO_SRC=$(realpath ${NANO_CFG_BASE}/../../..) #### XXX share obj -NANO_OBJ=$(realpath ${NANO_SRC}/../$NANO_NAME/obj) +NANO_OBJ=$(realpath ${NANO_SRC}/../$NANO_NAME/obj || echo ${NANO_SRC}/../$NANO_NAME/obj) # Where cust_pkg() finds packages to install #XXX: Is this the right place? #NANO_PORTS=$(realpath ${NANO_SRC}/../ports) @@ -297,7 +297,7 @@ create_diskimage_mbr ( ) ( done # Populate the FAT partition, if needed - if [-n "${NANO_SLICE_FAT}" ]; then + if [ -n "${NANO_SLICE_FAT}" ]; then echo Creating MSDOS partition for kernel newfs_msdos -C ${NANO_SLICE_FAT_SIZE} -F 16 -L ${NANO_NAME} \ ${NANO_OBJ}/_.${NANO_SLICE_FAT}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512210508.tBL58KD8013631>