From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Wed, 26 Jan 2011 13:31:12 +0000 (+0000)
Subject: use absolute GzipTempDir
X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=commitdiff_plain;h=6fa75ef8b610d0781b9a967d6a3557378f3a4003;hp=f6fd28ea55d41011fd9f667941897c85bb9bf5c4

use absolute GzipTempDir
---

diff --git a/Makefile b/Makefile
index 7c87a0f..1cc20ff 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ clean:
 	createlang plpgsql backuppc
 	sudo chown backuppc cgi-bin/index.cgi
 	sudo chmod u+s cgi-bin/index.cgi
-	sudo rm -Rf /tmp/kinoindex
 
 update:
 	sudo -u backuppc ./bin/BackupPC_updatedb -c
@@ -18,5 +17,5 @@ tar:
 reset: clean update tar
 
 reindex:
-	sudo rm -Rf /tmp/kinosearch/
-	sudo -u backuppc DEBUG=1 bin/BackupPC_updatedb -j -v 3
+	sudo rm -Rf $(index)
+	echo sudo -u backuppc DEBUG=1 bin/BackupPC_updatedb -j -v 3
diff --git a/bin/BackupPC_burnArchiveCLI b/bin/BackupPC_burnArchiveCLI
index a1488c3..4e2086b 100755
--- a/bin/BackupPC_burnArchiveCLI
+++ b/bin/BackupPC_burnArchiveCLI
@@ -52,8 +52,7 @@ my $user = $Conf{SearchUser} || '';
 
 my $dbh = DBI->connect($dsn, $user, "", { RaiseError => 1, AutoCommit => 1 });
 
-my $tar_dir = $Conf{InstallDir}.'/';
-$tar_dir .= $Conf{GzipTempDir} || die "GzipTempDir isn't defined in configuration";
+my $tar_dir = $Conf{GzipTempDir} || die "GzipTempDir isn't defined in configuration";
 
 die "problem with $tar_dir, check GzipTempDir in configuration\n" unless (-d $tar_dir);
 
diff --git a/bin/BackupPC_checkArchiveConsistency b/bin/BackupPC_checkArchiveConsistency
index 169d0d3..7b7c1f8 100755
--- a/bin/BackupPC_checkArchiveConsistency
+++ b/bin/BackupPC_checkArchiveConsistency
@@ -12,7 +12,7 @@ my %Conf = $bpc->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 $tar_dir = $Conf{GzipTempDir};
 my $dvd_nr = $ARGV[0];
 
 if (!defined($dvd_nr)) {
diff --git a/bin/BackupPC_incPartsUpdate b/bin/BackupPC_incPartsUpdate
index bed439f..442c027 100755
--- a/bin/BackupPC_incPartsUpdate
+++ b/bin/BackupPC_incPartsUpdate
@@ -97,7 +97,7 @@ my $user = $Conf{SearchUser} || '';
 
 my $dbh = DBI->connect($dsn, $user, "", { RaiseError => 1, AutoCommit => 0 });
 
-my $tar_dir = $Conf{InstallDir}.'/'.$Conf{GzipTempDir};
+my $tar_dir = $Conf{GzipTempDir};
 
 die "problem with $tar_dir, check GzipTempDir in configuration\n" unless (-d $tar_dir && -w $tar_dir);
 
diff --git a/bin/BackupPC_removeBurnedArchives b/bin/BackupPC_removeBurnedArchives
index 19faadd..798b1fa 100755
--- a/bin/BackupPC_removeBurnedArchives
+++ b/bin/BackupPC_removeBurnedArchives
@@ -9,13 +9,12 @@ 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};
+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
diff --git a/bin/BackupPC_tarIncCreate b/bin/BackupPC_tarIncCreate
index 4e7bb72..3cad08f 100755
--- a/bin/BackupPC_tarIncCreate
+++ b/bin/BackupPC_tarIncCreate
@@ -198,7 +198,7 @@ my(%HardLinkExtraFiles, @HardLinks);
 
 my $max_file_size = $Conf{'MaxArchiveFileSize'} || die "problem with MaxArchiveFileSize parametar";
 
-my $tar_dir = $Conf{InstallDir}.'/'.$Conf{GzipTempDir};
+my $tar_dir = $Conf{GzipTempDir};
 die "problem with $tar_dir, check GzipTempDir in configuration\n" unless (-d $tar_dir && -w $tar_dir);
 
 my $tar_file = BackupPC::Search::getGzipName($Host, $ShareName, $Num) || die "can't getGzipName($Host, $ShareName, $Num)";
diff --git a/conf/config.pl b/conf/config.pl
index 4342af1..d0b1a68 100644
--- a/conf/config.pl
+++ b/conf/config.pl
@@ -2298,7 +2298,7 @@ $Conf{KinoPath} = '/tmp/kinosearch';
 #
 # temp directory for storing gzip and iso files when createing iso images
 #
-$Conf{GzipTempDir} = 'temp';
+$Conf{GzipTempDir} = "$Conf{TopDir}/temp";
 
 #
 # nameing schema for snapshots (.tar.gz will be added)
diff --git a/lib/BackupPC/Search.pm b/lib/BackupPC/Search.pm
index 43587dc..a1bd9a7 100644
--- a/lib/BackupPC/Search.pm
+++ b/lib/BackupPC/Search.pm
@@ -300,10 +300,9 @@ sub getGzipName($$$)
 sub get_tgz_size_by_name($) {
 	my $name = shift;
 
-	my $tgz = $Conf{InstallDir}.'/'.$Conf{GzipTempDir}.'/'.$name;
+	my $tgz = $Conf{GzipTempDir}.'/'.$name;
 	my $size = -1;
 
-	my $Dir = $Conf{InstallDir}."/data/log";
 	$|=1;
 	if (-f "${tgz}.tar.gz") {
 		$size = (stat("${tgz}.tar.gz"))[7];