From 145f267263b0f61a867f074688336275bda359fd Mon Sep 17 00:00:00 2001
From: Jacob Adams <tookmund@gmail.com>
Date: Sun, 7 Jun 2015 16:42:31 -0400
Subject: [PATCH] Begin condensing stuff

---
 releasetools/netbsd2minix/run.sh         | 31 +++++++++++++++++++++---
 releasetools/netbsd2minix/setupnetbsd.sh |  2 --
 releasetools/netbsd2minix/special.sh     | 15 ------------
 releasetools/netbsd2minix/whitelists.sh  | 10 --------
 4 files changed, 28 insertions(+), 30 deletions(-)
 delete mode 100755 releasetools/netbsd2minix/setupnetbsd.sh
 delete mode 100755 releasetools/netbsd2minix/special.sh
 delete mode 100755 releasetools/netbsd2minix/whitelists.sh

diff --git a/releasetools/netbsd2minix/run.sh b/releasetools/netbsd2minix/run.sh
index e3c785bb2..191970633 100755
--- a/releasetools/netbsd2minix/run.sh
+++ b/releasetools/netbsd2minix/run.sh
@@ -12,14 +12,39 @@ SRC=$MINIX/../newsrc
 export MINIX N2M NETBSD SRC
 
 echo "Setup NetBSD"
-$N2M/setupnetbsd.sh
+cd $NETBSD || (git clone --depth 1 git://github.com/jsonn/src $NETBSD && cd $NETBSD)
+git pull
 
 echo "Clear new src tree"
 mkdir -p $SRC
 rm -rf $SRC/*
 
 echo "Apply whitelists"
-$N2M/whitelists.sh
+
+cd $N2M/whitelist
+for item in `ls`
+do
+	$N2M/applywhitelist.sh $NETBSD/$item $item < $item
+	echo "$item moved"
+done
+
+$N2M/applywhitelist.sh $MINIX . < $N2M/minix.txt
 
 echo "Apply special-cases"
-$N2M/special.sh
+
+cd $MINIX
+
+for dir in "external bin games gnu libexec sbin tools usr.bin usr.sbin"
+do
+	cp -f $MINIX/$dir/Makefile $SRC/$dir
+done
+
+cp -r $MINIX/include/cdbr.h $SRC/include/cdbr.h
+cp -r $MINIX/share/zoneinfo $SRC/share/zoneinfo
+cp -r $MINIX/tools/llvm-librt $SRC/tools/llvm-librt
+cp -r $MINIX/tools/mkfs.mfs $SRC/tools/mkfs.mfs
+cp -r $MINIX/tools/mkproto $SRC/tools/mkproto
+cp -r $MINIX/tools/partition $SRC/tools/partition
+cp -r $MINIX/tools/toproto $SRC/tools/toproto
+cp -r $MINIX/tools/writeisofs $SRC/tools/writeisofs
+
diff --git a/releasetools/netbsd2minix/setupnetbsd.sh b/releasetools/netbsd2minix/setupnetbsd.sh
deleted file mode 100755
index 8cf2eac89..000000000
--- a/releasetools/netbsd2minix/setupnetbsd.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-cd $NETBSD || (git clone --depth 1 git://github.com/jsonn/src $NETBSD && cd $NETBSD)
-git pull
diff --git a/releasetools/netbsd2minix/special.sh b/releasetools/netbsd2minix/special.sh
deleted file mode 100755
index ea61cfc28..000000000
--- a/releasetools/netbsd2minix/special.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-# Manually-copied files
-
-for dir in "external bin games gnu libexec sbin usr.bin usr.sbin"
-do
-	cp -f $MINIX/$dir/Makefile $SRC/$dir
-done
-
-cp -r $MINIX/include/cdbr.h $SRC/include
-cp -r $MINIX/share/zoneinfo $SRC/share
-cp -r $MINIX/tools/llvm-librt $SRC/tools
-cp -r $MINIX/tools/mkfs.mfs $SRC/tools
-cp -r $MINIX/tools/mkproto $SRC/tools
-cp -r $MINIX/tools/partition $SRC/tools
-cp -r $MINIX/tools/toproto $SRC/tools
-cp -r $MINIX/tools/writeisofs $SRC/tools
diff --git a/releasetools/netbsd2minix/whitelists.sh b/releasetools/netbsd2minix/whitelists.sh
deleted file mode 100755
index a626aa248..000000000
--- a/releasetools/netbsd2minix/whitelists.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-cd $N2M/whitelist
-for item in `ls`
-do
-	$N2M/applywhitelist.sh $NETBSD/$item $item < $item
-	echo "$item moved"
-done
-
-$N2M/applywhitelist.sh $MINIX . < $N2M/minix.txt
-
-cd $MINIX