use same logic as CGI/Archive.pm

[BackupPC.git] / bin / BackupPC_removeBurnedArchives

diff --git a/bin/BackupPC_removeBurnedArchives b/bin/BackupPC_removeBurnedArchives
index da45dad..798b1fa 100755 (executable)
--- a/bin/BackupPC_removeBurnedArchives
+++ b/bin/BackupPC_removeBurnedArchives
@@ -2,20 +2,19 @@
 use strict;
 no utf8;
 
-use lib "__INSTALLDIR__/lib";
+use lib "/usr/local/BackupPC/lib";
 use DBI;
 use BackupPC::Lib;
-use BackupPC::SearchLib;
+use BackupPC::Search;
 use Data::Dumper;
 my $bpc = BackupPC::Lib->new || die "can't create BackupPC::Lib";
 my %Conf = $bpc->Conf();
-my $tar_dir = $Conf{InstallDir}."/".$Conf{GzipTempDir};
-%BackupPC::SearchLib::Conf = %Conf;
+my $tar_dir = $Conf{GzipTempDir};
+%BackupPC::Search::Conf = %Conf;
 #die(Dumper(\%Conf));
 my $dsn = $Conf{SearchDSN} || die "need searchdsn in config.pl\n";
 my $user = $Conf{SearchUser} || '';
 my $dbh = DBI->connect($dsn, $user, "", { raiseerror => 1, autocommit => 0 });
-my $tar_dir = $Conf{InstallDir}.'/'.$Conf{GzipTempDir};
 my $sql = q{
        SELECT hosts.name AS host, shares.name AS share, backups.num AS num, MAX(archive_burned.copy)
        FROM backups
@@ -31,11 +30,11 @@ my $totalRemoved = 0;
 $sth->execute();
 
 while (my $row = $sth->fetchrow_hashref()) {
-       my $filename = BackupPC::SearchLib::getGzipName($row->{'host'}, $row->{'share'}, $row->{'num'});
+       my $filename = BackupPC::Search::getGzipName($row->{'host'}, $row->{'share'}, $row->{'num'});
        
        $filename .= ".tar.gz";
        $filename = $tar_dir . "/" . $filename;
-       my $fs_size = stat($filename)[7];
+       my $fs_size = (stat($filename))[7];
        $totalRemoved += $fs_size;
        print "removing $filename... size: $fs_size\n";
 #      if (system("rm $filename") != 0) {