Skip to content

Commit

Permalink
install fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
neil committed Jan 8, 2020
1 parent 73d0371 commit aed2ce0
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 43 deletions.
82 changes: 47 additions & 35 deletions src/Console/Assets/JQueryUI.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,54 +7,66 @@ class JQueryUI extends AbstractAsset

public static $name = 'jquery-ui';

public static $version = '1.11.4';
public static $version = '1.12.1';

public static $description = 'jQuery-ui';

public function run()
{
$this->downloadZip(
'https://download.jqueryui.com/download',
['jquery-ui-1.11.4.custom' => ''],
['jquery-ui-1.12.1.custom' => ''],
'POST',
[
'theme' => 'ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fsDefault=1.1em&fwDefault=bold&cornerRadius=2px&bgColorHeader=%23eb5b4f&bgTextureHeader=flat&borderColorHeader=%23eb5b4f&fcHeader=%23fff&iconColorHeader=%23ffffff&bgColorContent=%23fff&bgTextureContent=highlight_soft&borderColorContent=%23dddddd&fcContent=%23333333&iconColorContent=%23222222&bgColorDefault=%23fff&bgTextureDefault=glass&borderColorDefault=%23ccc&fcDefault=%23333&iconColorDefault=%23333&bgColorHover=%2300184a&bgTextureHover=inset_soft&borderColorHover=%2300184a&fcHover=%23fff&iconColorHover=%23fff&bgColorActive=%23ffffff&bgTextureActive=glass&borderColorActive=%23eb5b4f&fcActive=%23eb5b4f&iconColorActive=%23eb5b4f&bgColorHighlight=%2300184a&bgTextureHighlight=highlight_soft&borderColorHighlight=%2300184a&fcHighlight=%23fff&iconColorHighlight=%23fff&bgColorError=%23b81900&bgTextureError=diagonals_thick&borderColorError=%23cd0a0a&fcError=%23ffffff&iconColorError=%23ffd27a&bgColorOverlay=%23eb5b4f&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=80&bgColorShadow=%23000000&bgTextureShadow=flat&bgImgOpacityShadow=10&opacityShadow=1&thicknessShadow=20px&offsetTopShadow=5px&offsetLeftShadow=5px&cornerRadiusShadow=5px&bgImgOpacityHeader=35&bgImgOpacityContent=0&bgImgOpacityDefault=0&bgImgOpacityHover=20&bgImgOpacityActive=65&bgImgOpacityHighlight=20&bgImgOpacityError=18',
'core' => 'on',
'widget' => 'on',
'mouse' => 'on',
'position' => 'on',
'draggable' => 'on',
'droppable' => 'on',
'resizable' => 'on',
'selectable' => 'on',
'sortable' => 'on',
'accordion' => 'on',
'autocomplete' => 'on',
'button' => 'on',
'datepicker' => 'on',
'dialog' => 'on',
'menu' => 'on',
'progressbar' => 'on',
'selectmenu' => 'on',
'slider' => 'on',
'spinner' => 'on',
'data' => 'on',
'disable-selection' => 'on',
'focusable' => 'on',
'form-reset-mixin' => 'on',
'jquery-1-7' => 'on',
'keycode' => 'on',
'labels' => 'on',
'scroll-parent' => 'on',
'tabbable' => 'on',
'unique-id' => 'on',
'widgets/draggable' => 'off',
'widgets/droppable' => 'on',
'widgets/resizable' => 'on',
'widgets/selectable' => 'on',
'widgets/sortable' => 'on',
'widgets/accordion' => 'on',
'widgets/autocomplete' => 'on',
'widgets/button' => 'on',
'widgets/checkboxradio' => 'on',
'widgets/controlgroup' => 'on',
'widgets/datepicker' => 'on',
'widgets/dialog' => 'on',
'widgets/menu' => 'on',
'widgets/mouse' => 'on',
'widgets/progressbar' => 'on',
'widgets/selectmenu' => 'on',
'widgets/slider' => 'on',
'widgets/spinner' => 'on',
'widgets/tabs' => 'on',
'effect' => 'on',
'effect-blind' => 'on',
'effect-bounce' => 'on',
'effect-clip' => 'on',
'effect-drop' => 'on',
'effect-explode' => 'on',
'effect-fade' => 'on',
'effect-fold' => 'on',
'effect-highlight' => 'on',
'effect-puff' => 'on',
'effect-pulsate' => 'on',
'effect-scale' => 'on',
'effect-shake' => 'on',
'effect-size' => 'on',
'effect-slide' => 'on',
'effect-transfer' => 'on',
'version' => '1.11.4'
'effects/effect-blind' => 'on',
'effects/effect-bounce' => 'on',
'effects/effect-clip' => 'on',
'effects/effect-drop' => 'on',
'effects/effect-explode' => 'on',
'effects/effect-fade' => 'on',
'effects/effect-fold' => 'on',
'effects/effect-highlight' => 'on',
'effects/effect-puff' => 'on',
'effects/effect-pulsate' => 'on',
'effects/effect-scale' => 'on',
'effects/effect-shake' => 'on',
'effects/effect-size' => 'on',
'effects/effect-slide' => 'on',
'effects/effect-transfer' => 'on',
'version' => '1.12.1'
]
);
$this->downloadZip(
Expand Down
15 changes: 7 additions & 8 deletions src/Http/Controllers/InstallController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use CoasterCms\Models\User;
use DB;
use Dotenv\Dotenv;
use Dotenv\Loader;
use Hash;
use Illuminate\Routing\Controller;
use Request;
Expand Down Expand Up @@ -166,11 +167,10 @@ public function saveDatabaseSettings()

try {
$envFileContents = File::getEnvContents();
$dotEnv = new Dotenv(base_path(), File::getEnvFile());
foreach ($dotEnv->load() as $env) {
$envParts = explode('=', $env);
if (key_exists($envParts[0], $updateEnv)) {
$envFileContents = str_replace($env, $envParts[0] . '=' . $updateEnv[$envParts[0]], $envFileContents);
$dotEnv = Dotenv::create([base_path()]);
foreach ($dotEnv->load() as $envVar => $envValue) {
if (key_exists($envVar, $updateEnv)) {
$envFileContents = preg_replace('#' . $envVar . '\s*=\s*\"*' . $envValue . '\s*\"\s*#', $envVar . '=' . $updateEnv[$envVar] . "\n", $envFileContents);
}
}

Expand All @@ -188,9 +188,8 @@ public function saveDatabaseSettings()
public function runDatabaseMigrations($skipEnvCheck = false)
{
$unMatchedEnvVars = [];
$envFile = new Dotenv(base_path(), File::getEnvFile());
foreach ($envFile->load() as $env) {
list($envVar, $envValue) = explode('=', $env, 2);
$envFile = Dotenv::create([base_path()]);
foreach ($envFile->load() as $envVar => $envValue) {
$envValue = trim($envValue, '"');
if (getenv($envVar) !== false && getenv($envVar) != $envValue) {
$unMatchedEnvVars[$envVar] = $envValue;
Expand Down

0 comments on commit aed2ce0

Please sign in to comment.