Change env storage

This commit is contained in:
René Preuß
2021-07-23 17:40:31 +02:00
parent d25046f545
commit 917af5c140
9 changed files with 48 additions and 24 deletions

View File

@@ -3,6 +3,7 @@
namespace App\Commands\Env; namespace App\Commands\Env;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Storage;
use LaravelZero\Framework\Commands\Command; use LaravelZero\Framework\Commands\Command;
class EnvBackupCommand extends Command class EnvBackupCommand extends Command
@@ -28,10 +29,9 @@ class EnvBackupCommand extends Command
*/ */
public function handle(): int public function handle(): int
{ {
$envFilePath = App::environmentFilePath(); $this->info(sprintf("The following environment file is used: '%s'", App::environmentFilePath()));
$this->info(sprintf("The following environment file is used: '%s'", $envFilePath));
file_put_contents($this->argument('file'), file_get_contents($envFilePath)); Storage::put($this->argument('file'), Storage::get('.env'));
$this->info('The environment file was successfully backed up.'); $this->info('The environment file was successfully backed up.');

View File

@@ -4,6 +4,7 @@ namespace App\Commands\Env;
use Dotenv\Dotenv; use Dotenv\Dotenv;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Storage;
use LaravelZero\Framework\Commands\Command; use LaravelZero\Framework\Commands\Command;
class EnvListCommand extends Command class EnvListCommand extends Command
@@ -29,18 +30,17 @@ class EnvListCommand extends Command
*/ */
public function handle(): int public function handle(): int
{ {
$envFilePath = App::environmentFilePath(); $this->info(sprintf("The following environment file is used: '%s'", App::environmentFilePath()));
$this->info(sprintf("The following environment file is used: '%s'", $envFilePath));
if (file_exists($envFilePath)) { if (Storage::exists('.env')) {
$env = Dotenv::parse(file_get_contents($envFilePath)); $env = Dotenv::parse(Storage::get('.env'));
} else { } else {
$this->warn('The environment file does not exist.'); $this->warn('The environment file does not exist.');
return 1; return 1;
} }
if(empty($env)) { if (empty($env)) {
$this->warn('The environment file is empty.'); $this->warn('The environment file is empty.');
return 2; return 2;

View File

@@ -3,6 +3,7 @@
namespace App\Commands\Env; namespace App\Commands\Env;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Storage;
use LaravelZero\Framework\Commands\Command; use LaravelZero\Framework\Commands\Command;
class EnvRestoreCommand extends Command class EnvRestoreCommand extends Command
@@ -28,10 +29,9 @@ class EnvRestoreCommand extends Command
*/ */
public function handle(): int public function handle(): int
{ {
$envFilePath = App::environmentFilePath(); $this->info(sprintf("The following environment file is used: '%s'", App::environmentFilePath()));
$this->info(sprintf("The following environment file is used: '%s'", $envFilePath));
file_put_contents($envFilePath, file_get_contents($this->argument('file'))); Storage::put('.env', Storage::get($this->argument('file')));
$this->info('The environment file was successfully restored.'); $this->info('The environment file was successfully restored.');

View File

@@ -4,6 +4,7 @@ namespace App\Commands\Env;
use Dotenv\Dotenv; use Dotenv\Dotenv;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Storage;
use LaravelZero\Framework\Commands\Command; use LaravelZero\Framework\Commands\Command;
class EnvSetCommand extends Command class EnvSetCommand extends Command
@@ -31,11 +32,10 @@ class EnvSetCommand extends Command
*/ */
public function handle(): int public function handle(): int
{ {
$envFilePath = App::environmentFilePath(); $this->info(sprintf("The following environment file is used: '%s'", App::environmentFilePath()));
$this->info(sprintf("The following environment file is used: '%s'", $envFilePath));
if (file_exists($envFilePath)) { if (Storage::exists('.env')) {
$env = Dotenv::parse(file_get_contents($envFilePath)); $env = Dotenv::parse(Storage::get('.env'));
} else { } else {
$this->warn('The environment file does not exist. Creating a new one...'); $this->warn('The environment file does not exist. Creating a new one...');
$env = []; $env = [];
@@ -43,7 +43,7 @@ class EnvSetCommand extends Command
$env[strtoupper($this->argument('key'))] = $this->argument('value'); $env[strtoupper($this->argument('key'))] = $this->argument('value');
file_put_contents($envFilePath, self::updateEnv($env)); Storage::put('.env', self::updateEnv($env));
$this->info('The environment file was successfully updated.'); $this->info('The environment file was successfully updated.');

View File

@@ -7,6 +7,7 @@ use App\Commands\Env\EnvSetCommand;
use Dotenv\Dotenv; use Dotenv\Dotenv;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Storage;
use LaravelZero\Framework\Commands\Command; use LaravelZero\Framework\Commands\Command;
class InitCommand extends Command class InitCommand extends Command
@@ -36,11 +37,10 @@ class InitCommand extends Command
*/ */
public function handle(Client $client): int public function handle(Client $client): int
{ {
$envFilePath = App::environmentFilePath(); $this->info(sprintf("The following environment file is used: '%s'", App::environmentFilePath()));
$this->info(sprintf("The following environment file is used: '%s'", $envFilePath));
if (file_exists($envFilePath)) { if (Storage::exists('.env')) {
$env = Dotenv::parse(file_get_contents($envFilePath)); $env = Dotenv::parse(Storage::get('.env'));
} else { } else {
$this->warn('The environment file does not exist. Creating a new one...'); $this->warn('The environment file does not exist. Creating a new one...');
$env = []; $env = [];
@@ -102,7 +102,7 @@ class InitCommand extends Command
$this->warn('No pull zone was specified, therefore no pull zone is flushed during deployment.'); $this->warn('No pull zone was specified, therefore no pull zone is flushed during deployment.');
} }
file_put_contents($envFilePath, EnvSetCommand::updateEnv($env)); Storage::put('.env', EnvSetCommand::updateEnv($env));
$this->info('The environment file was successfully updated.'); $this->info('The environment file was successfully updated.');

View File

@@ -16,9 +16,7 @@ class AppServiceProvider extends ServiceProvider
*/ */
public function boot() public function boot()
{ {
Storage::extend('ftp', function ($app, $config) { //
return new Filesystem(new FtpAdapter($config));
});
} }
/** /**

View File

@@ -15,6 +15,21 @@ $app = new LaravelZero\Framework\Application(
dirname(__DIR__) dirname(__DIR__)
); );
/*
|--------------------------------------------------------------------------
| Set the correct path for the environment file
|--------------------------------------------------------------------------
|
| If the current directory has a .env file then we will use that instead
| of the global one, otherwise the one under the user homepage.
|
*/
if (!file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . '.env')) {
$app->useEnvironmentPath(getenv('HOME') . DIRECTORY_SEPARATOR . '.bunny-cli');
}
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Bind Important Interfaces | Bind Important Interfaces

Binary file not shown.

11
config/filesystems.php Normal file
View File

@@ -0,0 +1,11 @@
<?php
return [
'default' => 'local',
'disks' => [
'local' => [
'driver' => 'local',
'root' => getenv('HOME') . DIRECTORY_SEPARATOR . '.bunny-cli',
],
],
];