pgbackrest.git / summary / log / commit / refs
commit 166318d00d324504f242a84a134309ff496c06e2
Author: David Steele <github@thelabyrinth.net>
Date: Sat Jun 07 20:25:20 2014 +0000
Moved remaining libraries and other files.
bin/pg_backrest.pl | 0
bin/pg_backrest_remote.pl | 9 ++++-----
conf/pg_backrest.conf.sample | 0
lib/BackRest/Backup.pm | 0
lib/BackRest/Db.pm | 0
lib/BackRest/File.pm | 5 ++---
lib/BackRest/Remote.pm | 2 +-
test/lib/BackRestTest/FileTest.pm | 25 ++++++++++++------------
8 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/pg_backrest.pl b/bin/pg_backrest.pl
similarity index 100%
rename from pg_backrest.pl
rename to bin/pg_backrest.pl
diff --git a/bin/pg_backrest_remote.pl b/bin/pg_backrest_remote.pl
index 8d17bd15f..a3e0160bc 100755
--- a/bin/pg_backrest_remote.pl
+++ b/bin/pg_backrest_remote.pl
@@ -14,11 +14,10 @@ use File::Basename;
use Getopt::Long;
use Carp;
-use lib dirname($0) . '/..';
use lib dirname($0) . '/../lib';
use BackRest::Utility;
-use pg_backrest_file;
-use pg_backrest_remote;
+use BackRest::File;
+use BackRest::Remote;
####################################################################################################################################
# Operation constants
@@ -59,10 +58,10 @@ use constant
log_level_set(OFF, OFF);
# Create the file object
-my $oFile = pg_backrest_file->new();
+my $oFile = BackRest::File->new();
# Create the remote object
-my $oRemote = pg_backrest_remote->new();
+my $oRemote = BackRest::Remote->new();
# Write the greeting so remote process knows who we are
$oRemote->greeting_write();
diff --git a/pg_backrest.conf b/conf/pg_backrest.conf.sample
similarity index 100%
rename from pg_backrest.conf
rename to conf/pg_backrest.conf.sample
diff --git a/pg_backrest_backup.pm b/lib/BackRest/Backup.pm
similarity index 100%
rename from pg_backrest_backup.pm
rename to lib/BackRest/Backup.pm
diff --git a/pg_backrest_db.pm b/lib/BackRest/Db.pm
similarity index 100%
rename from pg_backrest_db.pm
rename to lib/BackRest/Db.pm
diff --git a/pg_backrest_file.pm b/lib/BackRest/File.pm
similarity index 99%
rename from pg_backrest_file.pm
rename to lib/BackRest/File.pm
index c6cd3d370..9d79578a5 100644
--- a/pg_backrest_file.pm
+++ b/lib/BackRest/File.pm
@@ -1,7 +1,7 @@
####################################################################################################################################
# FILE MODULE
####################################################################################################################################
-package pg_backrest_file;
+package BackRest::File;
use threads;
use strict;
@@ -20,11 +20,10 @@ use IO::Compress::Gzip qw(gzip $GzipError);
use IO::Uncompress::Gunzip qw(gunzip $GunzipError);
use IO::String;
-use lib dirname($0);
use lib dirname($0) . "/../lib";
use BackRest::Exception;
use BackRest::Utility;
-use pg_backrest_remote;
+use BackRest::Remote;
use Exporter qw(import);
our @EXPORT = qw(PATH_ABSOLUTE PATH_DB PATH_DB_ABSOLUTE PATH_BACKUP PATH_BACKUP_ABSOLUTE
diff --git a/pg_backrest_remote.pm b/lib/BackRest/Remote.pm
similarity index 99%
rename from pg_backrest_remote.pm
rename to lib/BackRest/Remote.pm
index 6b8b08897..3a5178bc9 100644
--- a/pg_backrest_remote.pm
+++ b/lib/BackRest/Remote.pm
@@ -1,7 +1,7 @@
####################################################################################################################################
# REMOTE MODULE
####################################################################################################################################
-package pg_backrest_remote;
+package BackRest::Remote;
use threads;
use strict;
diff --git a/test/lib/BackRestTest/FileTest.pm b/test/lib/BackRestTest/FileTest.pm
index 5acf39d81..1a3761ef0 100755
--- a/test/lib/BackRestTest/FileTest.pm
+++ b/test/lib/BackRestTest/FileTest.pm
@@ -17,11 +17,10 @@ use File::stat;
use Fcntl ':mode';
use Scalar::Util 'blessed';
-use lib dirname($0) . "/..";
use lib dirname($0) . "/../lib";
use BackRest::Utility;
-use pg_backrest_file;
-use pg_backrest_remote;
+use BackRest::File;
+use BackRest::Remote;
use Exporter qw(import);
our @EXPORT = qw(BackRestFileTest);
@@ -56,7 +55,7 @@ sub BackRestFileTest
#-------------------------------------------------------------------------------------------------------------------------------
# Create remote
#-------------------------------------------------------------------------------------------------------------------------------
- my $oRemote = pg_backrest_remote->new
+ my $oRemote = BackRest::Remote->new
(
strHost => $strHost,
strUser => $strUser,
@@ -75,7 +74,7 @@ sub BackRestFileTest
# Loop through local/remote
for (my $bRemote = 0; $bRemote <= 1; $bRemote++)
{
- my $oFile = pg_backrest_file->new
+ my $oFile = BackRest::File->new
(
strStanza => $strStanza,
bNoCompression => true,
@@ -180,7 +179,7 @@ sub BackRestFileTest
for (my $bRemote = 0; $bRemote <= 1; $bRemote++)
{
- my $oFile = pg_backrest_file->new
+ my $oFile = BackRest::File->new
(
strStanza => $strStanza,
bNoCompression => true,
@@ -270,7 +269,7 @@ sub BackRestFileTest
for (my $bRemote = 0; $bRemote <= 1; $bRemote++)
{
- my $oFile = pg_backrest_file->new
+ my $oFile = BackRest::File->new
(
strStanza => $strStanza,
bNoCompression => true,
@@ -365,7 +364,7 @@ sub BackRestFileTest
for (my $bRemote = 0; $bRemote <= 1; $bRemote++)
{
- my $oFile = pg_backrest_file->new
+ my $oFile = BackRest::File->new
(
strStanza => $strStanza,
bNoCompression => true,
@@ -459,7 +458,7 @@ sub BackRestFileTest
for (my $bRemote = 0; $bRemote <= 1; $bRemote++)
{
- my $oFile = pg_backrest_file->new
+ my $oFile = BackRest::File->new
(
strStanza => $strStanza,
bNoCompression => true,
@@ -565,7 +564,7 @@ sub BackRestFileTest
my $strHost = $bRemote ? "127.0.0.1" : undef;
my $strUser = $bRemote ? "dsteele" : undef;
- my $oFile = pg_backrest_file->new
+ my $oFile = BackRest::File->new
(
strStanza => $strStanza,
bNoCompression => true,
@@ -637,7 +636,7 @@ sub BackRestFileTest
for (my $bRemote = 0; $bRemote <= 1; $bRemote++)
{
- my $oFile = pg_backrest_file->new
+ my $oFile = BackRest::File->new
(
strStanza => $strStanza,
bNoCompression => true,
@@ -699,7 +698,7 @@ sub BackRestFileTest
for (my $bRemote = 0; $bRemote <= 1; $bRemote++)
{
- my $oFile = pg_backrest_file->new
+ my $oFile = BackRest::File->new
(
strStanza => $strStanza,
strBackupClusterPath => ${strTestPath},
@@ -805,7 +804,7 @@ sub BackRestFileTest
# Loop through destination compression
for (my $bDestinationCompressed = 0; $bDestinationCompressed <= 1; $bDestinationCompressed++)
{
- my $oFile = pg_backrest_file->new
+ my $oFile = BackRest::File->new
(
strStanza => "db",
strCommand => $strCommand,
[parent: 31b05eaab3c2]