@@ -72,10 +72,10 @@ |
||
72 | 72 | $executable = new Tar($this->pathToCommand); |
73 | 73 | $executable->archiveDirectory($this->path); |
74 | 74 | $executable->archiveTo($this->getArchiveFile($target)) |
75 | - ->useCompression( |
|
76 | - $target->shouldBeCompressed() ? $target->getCompression()->getCommand() : '' |
|
77 | - ) |
|
78 | - ->removeSourceDirectory(true); |
|
75 | + ->useCompression( |
|
76 | + $target->shouldBeCompressed() ? $target->getCompression()->getCommand() : '' |
|
77 | + ) |
|
78 | + ->removeSourceDirectory(true); |
|
79 | 79 | return $executable; |
80 | 80 | } |
81 | 81 |
@@ -368,7 +368,7 @@ |
||
368 | 368 | -v, --verbose Output more verbose information. |
369 | 369 | -V, --version Output version information and exit. |
370 | 370 | |
371 | -EOT; |
|
371 | +eot; |
|
372 | 372 | if ($this->isPhar) { |
373 | 373 | echo ' --version-check Check whether phpbu is up to date.' . PHP_EOL; |
374 | 374 | echo ' --self-update Upgrade phpbu to the latest version.' . PHP_EOL; |
@@ -95,14 +95,14 @@ |
||
95 | 95 | ); |
96 | 96 | } else { |
97 | 97 | $executable->fromPath($this->getRsyncLocation($target)) |
98 | - ->usePassword($this->password) |
|
99 | - ->usePasswordFile($this->passwordFile) |
|
100 | - ->toHost($this->host) |
|
101 | - ->toPath($this->path) |
|
102 | - ->toUser($this->user) |
|
103 | - ->compressed(!$target->shouldBeCompressed()) |
|
104 | - ->removeDeleted($this->delete) |
|
105 | - ->exclude($this->excludes); |
|
98 | + ->usePassword($this->password) |
|
99 | + ->usePasswordFile($this->passwordFile) |
|
100 | + ->toHost($this->host) |
|
101 | + ->toPath($this->path) |
|
102 | + ->toUser($this->user) |
|
103 | + ->compressed(!$target->shouldBeCompressed()) |
|
104 | + ->removeDeleted($this->delete) |
|
105 | + ->exclude($this->excludes); |
|
106 | 106 | } |
107 | 107 | return $executable; |
108 | 108 | } |
@@ -106,10 +106,10 @@ |
||
106 | 106 | $executable->useSSLCert($this->certFile); |
107 | 107 | } else { |
108 | 108 | $executable->usePassword($this->password) |
109 | - ->encodeBase64(true); |
|
109 | + ->encodeBase64(true); |
|
110 | 110 | } |
111 | 111 | $executable->useAlgorithm($this->algorithm) |
112 | - ->deleteUncrypted(!$this->keepUncrypted); |
|
112 | + ->deleteUncrypted(!$this->keepUncrypted); |
|
113 | 113 | |
114 | 114 | return $executable; |
115 | 115 | } |
@@ -114,12 +114,12 @@ |
||
114 | 114 | { |
115 | 115 | $executable = new Executable\Mcrypt((string) $this->pathToMcrypt); |
116 | 116 | $executable->useAlgorithm($this->algorithm) |
117 | - ->useKey($this->key) |
|
118 | - ->useKeyFile($this->keyFile) |
|
119 | - ->useConfig($this->config) |
|
120 | - ->useHash($this->hash) |
|
121 | - ->saveAt($target->getPathname()) |
|
122 | - ->deleteUncrypted(!$this->keepUncrypted); |
|
117 | + ->useKey($this->key) |
|
118 | + ->useKeyFile($this->keyFile) |
|
119 | + ->useConfig($this->config) |
|
120 | + ->useHash($this->hash) |
|
121 | + ->saveAt($target->getPathname()) |
|
122 | + ->deleteUncrypted(!$this->keepUncrypted); |
|
123 | 123 | return $executable; |
124 | 124 | } |
125 | 125 | } |
@@ -29,7 +29,7 @@ |
||
29 | 29 | public function sync(Target $target, Result $result) |
30 | 30 | { |
31 | 31 | $sourcePath = $target->getPathname(); |
32 | - $targetPath = $this->path . '/' . $target->getFilename(); |
|
32 | + $targetPath = $this->path . '/' . $target->getFilename(); |
|
33 | 33 | |
34 | 34 | $s3 = S3Client::factory( |
35 | 35 | [ |
@@ -48,39 +48,39 @@ |
||
48 | 48 | { |
49 | 49 | self::setSnippets([ |
50 | 50 | 'sBody' => 'style="font-family: Arial, Helvetica, sans-serif; ' . |
51 | - 'background-color:#343b43; ' . |
|
52 | - 'font-size: 15px; margin:0; ' . |
|
53 | - 'padding:0;"', |
|
51 | + 'background-color:#343b43; ' . |
|
52 | + 'font-size: 15px; margin:0; ' . |
|
53 | + 'padding:0;"', |
|
54 | 54 | 'sTableHeader' => 'style="width:100%; ' . |
55 | - 'font-family: Arial, Helvetica, sans-serif; ' . |
|
56 | - 'margin:0; color:#e6e6e6;" ' . |
|
57 | - 'align="center" cellpadding="5" cellspacing="0"', |
|
55 | + 'font-family: Arial, Helvetica, sans-serif; ' . |
|
56 | + 'margin:0; color:#e6e6e6;" ' . |
|
57 | + 'align="center" cellpadding="5" cellspacing="0"', |
|
58 | 58 | 'sTableError' => 'style="width:100%; ' . |
59 | - 'background-color:#e6e6e6; ' . |
|
60 | - 'margin:0 auto 15px; ' . |
|
61 | - 'border:1px solid #011516;" ' . |
|
62 | - 'align="center" cellpadding="5" cellspacing="0"', |
|
59 | + 'background-color:#e6e6e6; ' . |
|
60 | + 'margin:0 auto 15px; ' . |
|
61 | + 'border:1px solid #011516;" ' . |
|
62 | + 'align="center" cellpadding="5" cellspacing="0"', |
|
63 | 63 | 'sTableErrorCol' => 'style="border-top: 1px solid #f6f6f6; ' . |
64 | - 'border-bottom: 1px solid #c9c9c9;"', |
|
64 | + 'border-bottom: 1px solid #c9c9c9;"', |
|
65 | 65 | 'sTableContent' => 'style="width:420px; ' . |
66 | - 'font-family: Arial, Helvetica, sans-serif; ' . |
|
67 | - 'margin:0 auto;" ' . |
|
68 | - 'align="center" cellpadding="0" cellspacing="0"', |
|
66 | + 'font-family: Arial, Helvetica, sans-serif; ' . |
|
67 | + 'margin:0 auto;" ' . |
|
68 | + 'align="center" cellpadding="0" cellspacing="0"', |
|
69 | 69 | 'sTableContentCol' => 'style="padding:0 10px;"', |
70 | 70 | 'sTableStatus' => 'style="background-color:#%s; ' . |
71 | - 'width:100%%; ' . |
|
72 | - 'margin:0 auto 15px; ' . |
|
73 | - 'border:1px solid #011516;" ' . |
|
74 | - 'align="center" cellpadding="10" cellspacing="0"', |
|
71 | + 'width:100%%; ' . |
|
72 | + 'margin:0 auto 15px; ' . |
|
73 | + 'border:1px solid #011516;" ' . |
|
74 | + 'align="center" cellpadding="10" cellspacing="0"', |
|
75 | 75 | 'sTableStatusHead' => 'style="margin:0;"', |
76 | 76 | 'sTableStatusText' => 'style="font-size:16px;"', |
77 | 77 | 'sTableBackup' => 'style="width:100%; font-family: Arial, Helvetica, sans-serif; ' . |
78 | - 'background-color:#e6e6e6; ' . |
|
79 | - 'margin:0 0 15px; ' . |
|
80 | - 'border:1px solid #011516;" ' . |
|
81 | - 'align="center" cellpadding="5" cellspacing="0" width="100%"', |
|
78 | + 'background-color:#e6e6e6; ' . |
|
79 | + 'margin:0 0 15px; ' . |
|
80 | + 'border:1px solid #011516;" ' . |
|
81 | + 'align="center" cellpadding="5" cellspacing="0" width="100%"', |
|
82 | 82 | 'sTableBackupStatusColumn' => 'style="background-color:#%s; ' . |
83 | - 'border-bottom:1px solid #747474;"', |
|
83 | + 'border-bottom:1px solid #747474;"', |
|
84 | 84 | 'sTableBackupStatusText' => 'style="float:right;"', |
85 | 85 | 'sRowHead' => 'style="border-top: 1px solid #f6f6f6; border-bottom: 1px solid #c9c9c9;"', |
86 | 86 | 'sRowCheck' => 'style="border-top: 1px solid #f6f6f6; border-bottom: 1px solid #c9c9c9;"', |
@@ -3,7 +3,6 @@ |
||
3 | 3 | |
4 | 4 | use Google_Client as GClient; |
5 | 5 | use Google_Http_MediaFileUpload as GStream; |
6 | -use Google_Service_Drive as GDrive; |
|
7 | 6 | use Google_Service_Drive as GDriveService; |
8 | 7 | use Google_Service_Drive_DriveFile as GFile; |
9 | 8 | use phpbu\App\Backup\Collector; |
@@ -32,7 +32,7 @@ |
||
32 | 32 | "google/apiclient", |
33 | 33 | "php-opencloud/openstack" |
34 | 34 | ])) { |
35 | - continue; |
|
35 | + continue; |
|
36 | 36 | } |
37 | 37 | echo $package->name . ': ' . $package->version; |
38 | 38 | if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) { |