mirror of
https://github.com/fspc/gbootroot.git
synced 2025-04-04 07:43:22 -04:00
Now this works even if gbootroot hasn't been invocated first.
This commit is contained in:
parent
db2304e7bb
commit
1240220bc3
@ -495,6 +495,9 @@ sub alternatives {
|
|||||||
if (/->/) {
|
if (/->/) {
|
||||||
my($left,$right) = split(" -> ");
|
my($left,$right) = split(" -> ");
|
||||||
chomp $right;
|
chomp $right;
|
||||||
|
# Yard adds this stuff.
|
||||||
|
$right =~ s/\.\.\/\.\.//g;
|
||||||
|
|
||||||
$left =~ s/^.*\d+\s//g;
|
$left =~ s/^.*\d+\s//g;
|
||||||
if (!$alternatives{$right}) {
|
if (!$alternatives{$right}) {
|
||||||
$alternatives{$right} = [$left];
|
$alternatives{$right} = [$left];
|
||||||
@ -622,6 +625,8 @@ sub start_up {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
system "swim --initdb" if $db_reply eq "yes\n";
|
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);
|
close(SWIM);
|
||||||
@ -639,6 +644,11 @@ sub start_up {
|
|||||||
}
|
}
|
||||||
close(DPKG);
|
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 " .
|
print "Everything is in order, but it never hurts to rebuild swim " .
|
||||||
"with --rebuilddb\n";
|
"with --rebuilddb\n";
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user