From c69191276cc6dc41f1dfe76b1f08e2d22f34239e Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 14 Sep 2008 13:22:55 +0200 Subject: [PATCH] Finaly the Updbooster should work now --- config/updxlrator/download | 25 ++++++++++++++----------- config/updxlrator/setperms | Bin 5928 -> 0 bytes config/updxlrator/updxlrator | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 config/updxlrator/setperms diff --git a/config/updxlrator/download b/config/updxlrator/download index 4330fcd4b..de356c4be 100644 --- a/config/updxlrator/download +++ b/config/updxlrator/download @@ -18,7 +18,6 @@ my $repository='/var/updatecache'; my $login=''; my $dlrate=''; my $uuid=''; -my $wget="$apphome/bin/wget"; my $useragent="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)"; my %xlratorsettings=(); my %proxysettings=(); @@ -44,8 +43,9 @@ $vendorid =~ tr/A-Z/a-z/; unless (-d "$repository/download/$vendorid") { - system("mkdir $repository/download/$vendorid"); - system("$apphome/bin/setperms download/$vendorid"); + system("mkdir -p $repository/download/$vendorid"); + system("chown -R nobody.squid $repository/download/$vendorid"); + system("chmod 775 $repository/download/$vendorid"); } exit if (-e "$repository/download/$vendorid/$updatefile"); @@ -94,7 +94,7 @@ if ($xlratorsettings{'MAX_DOWNLOAD_RATE'} eq '') } $ENV{'http_proxy'} = $proxysettings{'UPSTREAM_PROXY'}; -@http_header = `$wget $login --user-agent="$useragent" --spider -S $sourceurl 2>&1`; +@http_header = `wget $login --user-agent="$useragent" --spider -S $sourceurl 2>&1`; $ENV{'http_proxy'} = ''; foreach (@http_header) @@ -106,7 +106,7 @@ foreach (@http_header) $ENV{'http_proxy'} = $proxysettings{'UPSTREAM_PROXY'}; unlink "$repository/download/$vendorid/$updatefile"; -$_ = system("$wget $login $dlrate --user-agent=\"$useragent\" -q -nc -P $repository/download/$vendorid $sourceurl"); +$_ = system("wget $login $dlrate --user-agent=\"$useragent\" -q -nc -P $repository/download/$vendorid $sourceurl"); $ENV{'http_proxy'} = ''; if ($_ == 0) @@ -115,14 +115,16 @@ if ($_ == 0) unless (-d "$repository/$vendorid") { - system("mkdir $repository/$vendorid"); - system("$apphome/bin/setperms $vendorid"); + system("mkdir -p $repository/$vendorid"); + system("chown -R nobody.squid $repository/$vendorid"); + system("chmod 775 $repository/$vendorid"); } unless (-d "$repository/$vendorid/$uuid") { - system("mkdir $repository/$vendorid/$uuid"); - system("$apphome/bin/setperms $vendorid/$uuid"); + system("mkdir -p $repository/$vendorid/$uuid"); + system("chown -R nobody.squid $repository/$vendorid/$uuid"); + system("chmod 775 $repository/$vendorid/$uuid"); } &writelog("Moving file to the cache directory: $vendorid/$uuid"); @@ -137,7 +139,8 @@ if ($_ == 0) &setcachestatus("$repository/$vendorid/$uuid/checkup.log",time); &setcachestatus("$repository/$vendorid/$uuid/access.log",time); - system("$apphome/bin/setperms $vendorid/$uuid/*"); + system("chown -R nobody.squid $repository/$vendorid/$uuid/*"); + system("chmod 775 $repository/$vendorid/$uuid/*"); } else { &writelog("Download finished with result code: ERROR"); @@ -180,7 +183,7 @@ sub readhash sub writelog { if ($logging) - { + { open (LOGFILE,">>$logfile"); my @now = localtime(time); printf LOGFILE "%04d-%02d-%02d %02d:%02d:%02d [%d] %s\n",$now[5]+1900,$now[4]+1,$now[3],$now[2],$now[1],$now[0],$$,$_[0]; diff --git a/config/updxlrator/setperms b/config/updxlrator/setperms deleted file mode 100644 index 9ffe011de159c9c2a6e7130c5fe7f833aa3712b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5928 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