webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Kleine Fixes am Pakfire - brauche Binary.

Browse Source 
OpenVPN geht nach einem ersten Test...


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@638 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-06-18 22:09:26 +00:00
parent dced81b20b
commit afabe9f7d1
5 changed files with 15 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pakfire/lib/functions.pl
View File

@@ -54,6 +54,7 @@ sub fetchfile {
$file = "$server[2]/$getfile";
} else {
$host = $gethost;
$file = $getfile;
}
$proto = "HTTP" unless $proto;
@@ -62,7 +63,7 @@ sub fetchfile {
my $ua = LWP::UserAgent->new;
$ua->agent("Pakfire/$Conf::version");
#$ua->timeout(5);
$ua->timeout(5);
#$ua->env_proxy;
my $response = $ua->get("http://$host/$file");
@@ -189,9 +190,9 @@ sub dblist {
@templine = split(/\;/,$line);
### filter here...
if ("$forweb" eq "forweb") {
print "<option value=\"$templine[0]\">$templine[1]</option>\n";
print "<option value=\"$templine[0]\">$templine[0]-$templine[1]-$templine[2]</option>\n";
} else {
print "$templine[0] $templine[1]\n";
print "Name: $templine[0]\nVersion: $templine[1]\nRelease: $templine[2]\n\n";
}
}
}
@@ -325,7 +326,7 @@ sub decryptpak {
my $return = system("gpg -d < $Conf::cachedir/$file | tar xj -C $Conf::tmpdir/");
logger("Decryption process returned the following: $return");
if ($return == 1) { exit 1; }
if ($return != 1) { exit 1; }
}
sub getpak {
@@ -354,8 +355,6 @@ sub getpak {
exit 1;
}
#message("\n## Downloading $file...");
unless ( "$force" eq "force" ) {
if ( -e "$Conf::cachedir/$file" ) {
return $file;
@@ -451,7 +450,6 @@ sub beautifysize {
sub makeuuid {
unless ( -e "$Conf::dbdir/uuid" ) {
message("Creating a random key...");
open(FILE, "</proc/sys/kernel/random/uuid");
my @line = <FILE>;
close(FILE);

6
src/pakfire/pakfire
View File

@@ -4,7 +4,7 @@
my $interactive = 1;
&Pakfire::message("### Welcome to IPFire Pakfire $Conf::version!");
&Pakfire::logger("### IPFire Pakfire $Conf::version started!");
### Check if we are running as root
#
@@ -94,5 +94,7 @@
&Pakfire::makeuuid();
&Pakfire::senduuid();
&Pakfire::getmirrors();
&Pakfire::dbgetlist();
} elsif ("$ARGV[0]" eq "list") {
&Pakfire::dblist("noweb");
}