Update of /cvsroot/fink/scripts/10.4-update
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv2831
Modified Files:
ChangeLog update.pl
Log Message:
After being sudo'ed to root, don't bother sudo'ing again.
Index: update.pl
===================================================================
RCS file: /cvsroot/fink/scripts/10.4-update/update.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- update.pl 14 Jun 2006 20:13:25 -0000 1.7
+++ update.pl 14 Jun 2006 20:15:32 -0000 1.8
@@ -50,6 +50,8 @@
&Fink::Services::execute($cmd, quiet=>1);
exit 0;
}
+# from now on, we are root
+
### initial message for users, if running for the first time (i.e., before
### setting the FINK_UPDATED environment variable)
@@ -98,12 +100,12 @@
### FINK-UPDATED environment variable)
if (!(exists $ENV{FINK_UPDATED})) {
- &Fink::Services::execute("sudo dpkg -i
base-$distribution/fink-mirrors_*");
- &Fink::Services::execute("sudo dpkg -i base-$distribution/fink_*");
+ &Fink::Services::execute("dpkg -i base-$distribution/fink-mirrors_*");
+ &Fink::Services::execute("dpkg -i base-$distribution/fink_*");
my ($cmd, $arg);
- $cmd = "export FINK_UPDATED=true; sudo ./update.pl";
+ $cmd = "export FINK_UPDATED=true; ./update.pl";
foreach $arg (@ARGV) {
if ($arg =~ /^[A-Za-z0-9_.+-]+$/) {
$cmd .= " $arg";
@@ -123,7 +125,7 @@
&Fink::Services::execute("touch $basepath/fink/10.4/stamp-rel-0.8.0");
&Fink::Services::execute("/usr/bin/perl -pi -e \"s|Distribution:
10.3|Distribution: 10.4|\" $basepath/etc/fink.conf");
&Fink::Services::execute("/usr/bin/perl -pi -e \"s|Distribution:
10.4-transitional|Distribution: 10.4|\" $basepath/etc/fink.conf");
-&Fink::Services::execute("sudo dpkg -i
base-10.4/fink_0.24.18-31_darwin-powerpc.deb");
+&Fink::Services::execute("dpkg -i
base-10.4/fink_0.24.18-31_darwin-powerpc.deb");
## clean out stale deb symlinks
&Fink::Services::execute("rm -f $basepath/fink/debs/*.deb");
@@ -139,7 +141,7 @@
&Fink::Services::execute("fink scanpackages");
## these get in the way, so get rid of them before trying apt-get dist-upgrade
&Fink::Services::execute("fink remove ncurses-dev libncurses5 libncursesw5");
-&Fink::Services::execute("sudo apt-get update; sudo apt-get dist-upgrade");
+&Fink::Services::execute("apt-get update; apt-get dist-upgrade");
&Fink::Services::execute("fink update-all");
exit 0;
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/scripts/10.4-update/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog 14 Jun 2006 20:13:25 -0000 1.7
+++ ChangeLog 14 Jun 2006 20:15:32 -0000 1.8
@@ -1,6 +1,7 @@
2006-06-14 Daniel Macks <[EMAIL PROTECTED]>
- * update.pl: print_breaking accepts multiple paragraphs.
+ * update.pl: print_breaking accepts multiple paragraphs. Don't
+ bother sudo'ing if we are already root.
2006-06-14 Dave Morrison <[EMAIL PROTECTED]>
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
