Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update composer; fix environment setting

Browse source
This commit is contained in:
Dane Everitt 2016-01-25 20:30:50 -05:00
parent 96592e2875
commit 4a7fdaedde
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Console/Commands/UpdateEnvironment.php
View file

@ -84,9 +84,12 @@ class UpdateEnvironment extends Command
$this->line('Writing new environment configuration to file.'); $this->line('Writing new environment configuration to file.');
foreach ($variables as $key => $value) { foreach ($variables as $key => $value) {
$regex = '/^' . $key . '=(.*)$/m'; $newValue = $key . '=' . $value;
$replace = $key . '=' . $value; if (preg_match_all('/^' . $key . '=(.*)$/m', $envContents) < 1) {
$envContents = preg_replace($regex, $replace, $envContents); $envContents = $envContents . "\n" . $newValue;
} else {
$envContents = preg_replace('/^' . $key . '=(.*)$/m', $newValue, $envContents);
}
$bar->advance(); $bar->advance();
} }

8
composer.json
View file

@ -74,13 +74,17 @@
"sed -i.bak 's/homestead.app/pterodactyl.local/g' Homestead.yaml", "sed -i.bak 's/homestead.app/pterodactyl.local/g' Homestead.yaml",
"rm Homestead.yaml.bak", "rm Homestead.yaml.bak",
"php artisan key:generate", "php artisan key:generate",
"php artisan pterodactyl:env" "php artisan pterodactyl:env",
"php artisan migrate",
"php artisan pterodactyl:user"
], ],
"setup": [ "setup": [
"composer install --ansi --no-dev", "composer install --ansi --no-dev",
"php -r \"copy('.env.example', '.env');\"", "php -r \"copy('.env.example', '.env');\"",
"php artisan key:generate", "php artisan key:generate",
"php artisan pterodactyl:env" "php artisan pterodactyl:env",
"php artisan migrate",
"php artisan pterodactyl:user"
] ]
}, },
"config": { "config": {