From 1240220bc309b04c0b9fb038797679606727fa41 Mon Sep 17 00:00:00 2001
From: freesource <freesource>
Date: Fri, 24 Aug 2001 06:39:10 +0000
Subject: [PATCH] Now this works even if gbootroot hasn't been invocated first.

---
 yard/scripts/make_debian | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/yard/scripts/make_debian b/yard/scripts/make_debian
index e8f661d..5f88237 100755
--- a/yard/scripts/make_debian
+++ b/yard/scripts/make_debian
@@ -494,7 +494,10 @@ sub alternatives {
     while (<LS>) {
 	if (/->/) {
 	    my($left,$right) = split(" -> ");
-	    chomp $right;
+	    chomp $right; 
+	    # Yard adds this stuff.
+	    $right =~ s/\.\.\/\.\.//g; 
+
 	    $left =~ s/^.*\d+\s//g;
 	    if (!$alternatives{$right}) {
 		$alternatives{$right} = [$left]; 
@@ -622,6 +625,8 @@ sub start_up {
 		    }
 		}
 		system "swim --initdb" if $db_reply eq "yes\n";
+		die "Sorry, can't continue until database is " .
+		    "generated\n" if $db_reply eq "no\n";
 	    }
 	}
     close(SWIM);
@@ -639,6 +644,11 @@ sub start_up {
     }
     close(DPKG);
 
+    if (!-d $home) {
+	home_builder($template_dir);
+	home_builder("$home_yard_replacements/etc");
+    }
+
     print "Everything is in order, but it never hurts to rebuild swim " .
 	"with --rebuilddb\n";