Fixed env writing functions

This commit is contained in:
Graham Campbell
2016-01-29 23:01:41 +00:00
parent dc8b8eae78
commit 6869d6b257

View File

@@ -12,6 +12,8 @@
namespace CachetHQ\Cachet\Http\Controllers;
use CachetHQ\Cachet\Models\User;
use Dotenv\Dotenv;
use Dotenv\Exception\InvalidPathException;
use GrahamCampbell\Binput\Facades\Binput;
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Auth;
@@ -219,13 +221,16 @@ class SetupController extends Controller
*/
protected function writeEnv($key, $value)
{
static $path = null;
$path = app()->environmentFile();
try {
(new Dotenv(app()->environmentPath(), $path))->load();
if ($path === null || ($path !== null && file_exists($path))) {
$path = base_path('.env');
file_put_contents($path, str_replace(
env(strtoupper($key)), $value, file_get_contents($path)
));
} catch (InvalidPathException $e) {
//
}
}
@@ -238,7 +243,9 @@ class SetupController extends Controller
{
$key = str_random(32);
$path = base_path('.env');
$path = app()->environmentFile();
(new Dotenv(app()->environmentPath(), $path))->load();
file_put_contents($path, str_replace(
Config::get('app.key'), $key, file_get_contents($path)