From 77662cf69d4b325e50176de947a2f76e87d880fa Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Sun, 20 Feb 2011 01:44:12 -0600
Subject: [PATCH] script/makeworld, seed: move seed to match spec

---
 script/makeworld                       | 9 ++++++---
 {worlds/seed => seed}/base/amd64/.keep | 0
 {worlds/seed => seed}/base/i386/.keep  | 0
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename {worlds/seed => seed}/base/amd64/.keep (100%)
 rename {worlds/seed => seed}/base/i386/.keep (100%)

diff --git a/script/makeworld b/script/makeworld
index 3b53b36..bbbc6cc 100755
--- a/script/makeworld
+++ b/script/makeworld
@@ -80,7 +80,10 @@ cleanup() {
 }
 
 # Root directory of makeworld
-ROOT="$(realpath "$(dirname "${0}")/../worlds")"
+ROOT="$(realpath "$(dirname "${0}")/..")"
+
+# Location of worlds
+WORLDS="${ROOT}/worlds"
 
 # Compute make -j<cpus*2>
 make_cpus="$(sysctl -n hw.ncpu)"
@@ -114,9 +117,9 @@ want root
 sequence="${*:-${make_tgts}}"
 
 # Target world directory
-world="${ROOT}/${ARCH}/${CONF}"
+world="${WORLDS}/${ARCH}/${CONF}"
 # Source chroot seed directory
-seed="${ROOT}/seed/$(uname -m)/base"
+seed="${ROOT}/seed/base/$(uname -m)"
 # Root directory for chroot
 build="${world}/chroot"
 
diff --git a/worlds/seed/base/amd64/.keep b/seed/base/amd64/.keep
similarity index 100%
rename from worlds/seed/base/amd64/.keep
rename to seed/base/amd64/.keep
diff --git a/worlds/seed/base/i386/.keep b/seed/base/i386/.keep
similarity index 100%
rename from worlds/seed/base/i386/.keep
rename to seed/base/i386/.keep
-- 
2.42.0