From af65c343b3056365813af7ed842981c173a68498 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sun, 7 Oct 2012 01:09:58 +0000
Subject: [PATCH] Unifying shell scripts

---
 targets/Linux      |  2 +-
 targets/Linux-i386 | 10 +++++-----
 targets/NetBSD     | 23 ++++++++++++-----------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/targets/Linux b/targets/Linux
index 7bdb6f0..60a4460 100644
--- a/targets/Linux
+++ b/targets/Linux
@@ -27,7 +27,7 @@ _create_directories()
 	echo -n "Creating missing directories:"
 	while true; do
 		echo -n " $1"
-		$MKDIR "$DESTDIR/$1"				|| exit 2
+		$MKDIR -- "$DESTDIR/$1"				|| exit 2
 		shift || break
 	done
 	echo
diff --git a/targets/Linux-i386 b/targets/Linux-i386
index ff69aba..bf755fc 100644
--- a/targets/Linux-i386
+++ b/targets/Linux-i386
@@ -27,7 +27,7 @@ _image_image_pre()
 	check "$USAGE" DD DESTDIR DEVZERO IMAGE_FILE IMAGE_KERNEL IMAGE_SIZE \
 		MKDIR MKFS MOUNT UMOUNT
 
-	$MKDIR "$DESTDIR"					|| exit 2
+	$MKDIR -- "$DESTDIR"					|| exit 2
 	$UMOUNT "$DESTDIR"
 	$DD if="$DEVZERO" of="$IMAGE_FILE" count="$IMAGE_SIZE" &&
 	$MKFS "$IMAGE_FILE"					|| exit 2
@@ -56,13 +56,13 @@ _image_iso_pre()
 	check "$USAGE" CAT DESTDIR KERNEL IMAGE_FILE IMAGE_KERNEL INSTALL \
 		MKDIR MKISOFS RAMDISK TAR
 
-	$MKDIR "$DESTDIR"					|| exit 2
+	$MKDIR -- "$DESTDIR"					|| exit 2
 }
 
 _image_iso_post()
 {
 	#install kernel with ramdisk and modules
-	$MKDIR "$DESTDIR/boot"					|| exit 2
+	$MKDIR -- "$DESTDIR/boot"				|| exit 2
 	$INSTALL -m 755 "$IMAGE_KERNEL" "$DESTDIR/$KERNEL"	|| exit 2
 	if [ ! -z "$IMAGE_RAMDISK" ]; then
 		$INSTALL -m 644 "$IMAGE_RAMDISK" "$DESTDIR/$RAMDISK"
@@ -72,7 +72,7 @@ _image_iso_post()
 			(cd "$DESTDIR" && $TAR -xzf -)
 
 	#setup bootloader
-	$MKDIR "$DESTDIR/boot/grub"				|| exit 2
+	$MKDIR -- "$DESTDIR/boot/grub"				|| exit 2
 	$INSTALL -m 644 "/usr/lib/grub/i386-pc/stage2_eltorito" \
 	"$DESTDIR/boot/grub"					|| exit 2
 	$CAT > "$DESTDIR/boot/grub/menu.lst" << EOF
@@ -102,7 +102,7 @@ _image_ramdisk_pre()
 	check "$USAGE" DD DESTDIR DEVZERO DU GENEXT2FS GZIP IMAGE_FILE \
 		IMAGE_SIZE INSTALL LN MKDIR MKFS MV
 
-	$MKDIR "$DESTDIR"					|| exit 2
+	$MKDIR -- "$DESTDIR"					|| exit 2
 }
 
 _image_ramdisk_post()
diff --git a/targets/NetBSD b/targets/NetBSD
index b23af43..97166e5 100644
--- a/targets/NetBSD
+++ b/targets/NetBSD
@@ -40,7 +40,7 @@ _image_image_pre()
 		IMAGE_SIZE INSTALL INSTALLBOOT LDSO LN MBRLABEL MKDIR MKFS \
 		MKNOD MOUNT MV UMOUNT VNCONFIG VND
 
-	$MKDIR "$DESTDIR"					|| exit 2
+	$MKDIR -- "$DESTDIR"					|| exit 2
 	$SUDO $UMOUNT "$DESTDIR"
 	$SUDO $VNCONFIG -u "$VND"
 	$DD if="$DEVZERO" of="$IMAGE_FILE" count="$IMAGE_SIZE" &&
@@ -53,15 +53,15 @@ _image_image_pre()
 	$SUDO $MKFS "${VND}e"					&&
 	$SUDO $MOUNT "/dev/${VND}e" "$DESTDIR"			&&
 	$SUDO $CHOWN "$UID:$GID" "$DESTDIR"			&&
-	$MKDIR "$DESTDIR$PREFIX"
+	$MKDIR -- "$DESTDIR$PREFIX"
 }
 
 _image_image_post()
 {
 	$SUDO $CHOWN -R "0:0" "$DESTDIR"			&&
-	$SUDO $MKDIR "$DESTDIR/bin"				&&
+	$SUDO $MKDIR -- "$DESTDIR/bin"				&&
 	$SUDO $MV "$DESTDIR$PREFIX/bin/sh" "$DESTDIR/bin/sh"	&&
-	$SUDO $MKDIR "$DESTDIR/dev"				&&
+	$SUDO $MKDIR -- "$DESTDIR/dev"				&&
 	$SUDO $MKNOD -m 600 "$DESTDIR/dev/console" c 0 0	&&
 	$SUDO $MKNOD -m 600 "$DESTDIR/dev/hd0a" b 0 0		&&
 	$SUDO $MKNOD -m 600 "$DESTDIR/dev/hd0b" b 0 1		&&
@@ -79,13 +79,14 @@ _image_image_post()
 	$SUDO $MKNOD -m 600 "$DESTDIR/dev/rhd0f" c 3 5		&&
 	$SUDO $MKNOD -m 600 "$DESTDIR/dev/rhd0g" c 3 6		&&
 	$SUDO $MKNOD -m 600 "$DESTDIR/dev/rhd0h" c 3 7		&&
-	$SUDO $MKDIR "$DESTDIR/etc"				&&
-	$SUDO $MKDIR "$DESTDIR/libexec" "$DESTDIR/usr/libexec"	&&
+	$SUDO $MKDIR -- "$DESTDIR/etc"				&&
+	$SUDO $MKDIR -- "$DESTDIR/libexec" \
+			"$DESTDIR/usr/libexec"			&&
 	$SUDO $INSTALL -m 555 "$LDSO" \
 			"$DESTDIR/libexec/ld.elf_so"		&&
 	$SUDO $LN -s "/libexec/ld.elf_so" "$DESTDIR/usr/libexec"&&
-	$SUDO $MKDIR "$DESTDIR/proc"				&&
-	$SUDO $MKDIR "$DESTDIR/sbin"				&&
+	$SUDO $MKDIR -- "$DESTDIR/proc"				&&
+	$SUDO $MKDIR -- "$DESTDIR/sbin"				&&
 	SUBDIRS="Apps/Unix/src/others/tools" target oinit	&&
 	$SUDO $INSTALL -m 755 "Apps/Unix/src/others/tools/oinit" \
 			"$DESTDIR/sbin/init"			&&
@@ -140,12 +141,12 @@ _image_iso_pre()
 
 _image_iso_post()
 {
-	$MKDIR "$DESTDIR/dev"					|| exit 2
+	$MKDIR -- "$DESTDIR/dev"				|| exit 2
 	$SUDO $MKNOD -m 600 "$DESTDIR/dev/console" c 0 0	|| exit 2
-	$MKDIR "$DESTDIR/libexec" "$DESTDIR/usr/libexec"	|| exit 2
+	$MKDIR -- "$DESTDIR/libexec" "$DESTDIR/usr/libexec"	|| exit 2
 	$INSTALL -m 555 "$LDSO" "$DESTDIR/libexec/ld.elf_so"	|| exit 2
 	$LN -s "/libexec/ld.elf_so" "$DESTDIR/usr/libexec"	|| exit 2
-	$MKDIR "$DESTDIR/sbin"					|| exit 2
+	$MKDIR -- "$DESTDIR/sbin"				|| exit 2
 	SUBDIRS="Apps/Unix/src/others/tools" target oinit	|| exit 2
 	$INSTALL -m 755 "Apps/Unix/src/others/tools/oinit"	\
 			"$DESTDIR/sbin/init"			|| exit 2