Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31493
Modified Files:
ChangeLog bootstrap.pl
Log Message:
Message to users at end of bootstrap should guide them to the actual "dists"
tarball, whose name depends on the identity of the current bindist.
Index: bootstrap.pl
===================================================================
RCS file: /cvsroot/fink/fink/bootstrap.pl,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- bootstrap.pl 9 Mar 2006 03:35:56 -0000 1.73
+++ bootstrap.pl 12 Mar 2006 00:53:32 -0000 1.74
@@ -434,6 +434,16 @@
my $endmsg = "Internal error.";
chdir $homebase;
+my %bindists;
+if (-f "BINDISTS") {
+ open(IN,"BINDISTS") or die "Can't open BINDISTS: $!";
+ while(<IN>) {
+ chomp;
+ /(.*):\s*(.*)/;
+ $bindists{$1} = $2;
+ }
+ close(IN);
+ }
if (-d "pkginfo") {
if (&execute("cd pkginfo && ./inject.pl $installto -quiet")) {
# inject failed
@@ -442,9 +452,13 @@
your Fink installation should work nonetheless.
You can add the package descriptions at a later time if you want to
compile packages yourself.
-You can get them from CVS or by installing the packages$showversion.tar.gz
-tarball.
+You can get them
EOF
+if (defined($bindists{$distribution})) {
+$endmsg .= "by installing the
dists-$distribution-$bindists{$distribution}.tar.gz
+tarball, or";
+}
+ $endmsg .= " by running the command 'fink selfupdate'.";
} else {
# inject worked
$endmsg = <<"EOF";
@@ -456,9 +470,13 @@
$endmsg = <<"EOF";
You should now have a working Fink installation in '$installto'.
You still need package descriptions if you want to compile packages yourself.
-You can get them from CVS or by installing the packages$showversion.tar.gz
-tarball.
+You can get them
EOF
+if (defined($bindists{$distribution})) {
+$endmsg .= "by installing the
dists-$distribution-$bindists{$distribution}.tar.gz
+tarball, or";
+}
+ $endmsg .= " by running the command 'fink selfupdate'.";
}
### create Packages.gz files for apt
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -d -r1.399 -r1.400
--- ChangeLog 9 Mar 2006 03:35:56 -0000 1.399
+++ ChangeLog 12 Mar 2006 00:53:32 -0000 1.400
@@ -1,3 +1,9 @@
+2006-03-11 Dave Morrison <[EMAIL PROTECTED]>
+
+ * BINDISTS, bootstrap.pl: Message to users at end of bootstrap should
+ guide them to the actual "dists" tarball, whose name depends on
+ the identity of the current bindist.
+
2006-03-08 Daniel Macks <[EMAIL PROTECTED]>
* bootstrap.pl: Report fink version during initial checks.
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
