From f9de273fd444b6b09eff6a997f4bee96b3b492c2 Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Sat, 21 Mar 2020 10:54:57 +0100 Subject: [PATCH] - removed optional (developer) dependency checks for Ruby, gem and Compass from `/setup` dashboard #917 --- app/Controller/Setup.php | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/app/Controller/Setup.php b/app/Controller/Setup.php index a4173011..07ebd3fa 100644 --- a/app/Controller/Setup.php +++ b/app/Controller/Setup.php @@ -952,14 +952,11 @@ class Setup extends Controller { protected function checkSystemConfig(\Base $f3): array { $systemConf = []; if(function_exists('exec')){ - $gitOut = $composerOut = $rubyOut = $rubyGemsOut = $compassOut = $nodeOut = $npmOut = []; - $gitStatus = $composerStatus = $rubyStatus = $rubyGemsStatus = $compassStatus = $nodeStatus = $npmStatus = 1; + $gitOut = $composerOut = $nodeOut = $npmOut = []; + $gitStatus = $composerStatus = $nodeStatus = $npmStatus = 1; exec('git --version', $gitOut, $gitStatus); exec('composer -V', $composerOut, $composerStatus); - exec('ruby -v', $rubyOut, $rubyStatus); - exec('gem -v', $rubyGemsOut, $rubyGemsStatus); - exec('compass -v', $compassOut, $compassStatus); exec('node -v', $nodeOut, $nodeStatus); exec('npm -v', $npmOut, $npmStatus); @@ -980,24 +977,6 @@ class Setup extends Controller { 'check' => $composerStatus == 0, 'tooltip' => 'Composer # composer -V : ' . $composerOut[0] ], - 'Ruby' => [ - 'label' => 'Ruby', - 'version' => $rubyOut[0] ? 'installed' : 'missing', - 'check' => $rubyStatus == 0, - 'tooltip' => 'Ruby # ruby -v : ' . $rubyOut[0] - ], - 'rubyGems' => [ - 'label' => 'Ruby gem', - 'version' => $normalizeVersion($rubyGemsOut[0]) ?: 'missing', - 'check' => $rubyGemsStatus == 0, - 'tooltip' => 'gem # gem -v' - ], - 'compass' => [ - 'label' => 'Compass', - 'version' => $compassOut[0] ? 'installed' : 'missing', - 'check' => $compassStatus == 0, - 'tooltip' => 'Compass # compass -v : ' . $compassOut[0] - ], 'node' => [ 'label' => 'NodeJs', 'required' => number_format((float)$f3->get('REQUIREMENTS.PATH.NODE'), 1, '.', ''),