d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

There's no such program as [-n :(. Add the missing space. Also,

Browse Source 
work when the object directory doesn't exist yet. realpath hates
us, so use the backup of the realpath arg when that happens.
This commit is contained in:
Warner Losh 2015-12-21 05:08:20 +00:00
parent 986fd63b46
commit 17df9f4dcf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=292529
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/tools/nanobsd/embedded/common
View File

@ -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}