starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refine install process some more

Browse Source
This commit is contained in:
DariusIII
2017-04-26 10:41:51 +02:00
parent 1492bebc71
commit 62eb14c096
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_install/install_nntmux.php
+5 -2
View File
@@ -228,8 +228,11 @@ if (!$error) {
}
if (!file_exists($unrar_path)) {
ColorCLI::doEcho(ColorCLI::primary('Creating missing' . $unrar_path . ' folder'));
mkdir($unrar_path);
ColorCLI::doEcho(ColorCLI::primary('Creating missing ' . $unrar_path . ' folder'));
if (!@mkdir($unrar_path) && !is_dir($unrar_path)) {
throw new RuntimeException('Unable to create ' . $unrar_path . ' folder');
}
ColorCLI::doEcho(ColorCLI::primary('Folder ' . $unrar_path . ' successfully created'));
}
$unrarPathCheck = is_writable($unrar_path);
if ($unrarPathCheck === false) {
nntmux/config/Configure.php
+28 -6
View File
@@ -22,7 +22,7 @@ namespace nntmux\config;
class Configure
{
private $environments = [
private static $environments = [
'indexer' => [
'.env' => true,
'settings' => false
@@ -37,15 +37,28 @@ class Configure
],
];
/**
* Configure constructor.
*
* @param string $environment
*/
public function __construct($environment = 'indexer')
{
$this->loadEnvironment($environment);
try {
$this->loadEnvironment($environment);
} catch (\RuntimeException $e) {
echo $e->getMessage();
}
}
/**
* @param $environment
* @throws \RuntimeException
*/
private function loadEnvironment($environment)
{
if (array_key_exists($environment, $this->environments)) {
foreach ($this->environments[$environment] as $config => $throwException) {
if (array_key_exists($environment, Configure::$environments)) {
foreach (Configure::$environments[$environment] as $config => $throwException) {
$this->loadSettings($config, $throwException);
}
} else {
@@ -53,13 +66,18 @@ class Configure
}
}
/**
* @param $filename
* @param bool $throwException
* @throws \RuntimeException
*/
public function loadSettings($filename, $throwException = true)
{
if ($filename === '.env') {
$file = NN_ROOT . '.env';
} else {
$file = $file = NN_CONFIGS . $filename . '.php';
$file = NN_CONFIGS . $filename . '.php';
}
if (!file_exists($file) && $throwException) {
$errorCode = (int)($filename === '.env');
@@ -68,6 +86,10 @@ class Configure
$errorCode
);
}
if ($file !== NN_ROOT . '.env') {
require_once $file;
}
switch ($filename) {
case '.env':
@@ -76,7 +98,7 @@ class Configure
case 'settings':
$settings_file = NN_CONFIGS . 'settings.php';
if (is_file($settings_file)) {
require_once($settings_file);
require_once $settings_file;
if (PHP_SAPI === 'cli') {
$current_settings_file_version = 4; // Update this when updating settings.example.php
if (!defined('NN_SETTINGS_FILE_VERSION') ||