ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2025-06-23 09:25:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#401 Fix display of drush versions

Browse Source
This commit is contained in:
cytopia
2018-11-01 10:19:43 +01:00
parent 14cd1f0838
commit 7769e34794
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.devilbox/www/htdocs/_ajax_callback.php
View File

@ -48,9 +48,19 @@ if (loadClass('Helper')->isLoggedIn()) {
$_GET['software'] => (($version = loadClass('Php')->getDrupalConsoleVersion()) !== false) ? $version : $no $_GET['software'] => (($version = loadClass('Php')->getDrupalConsoleVersion()) !== false) ? $version : $no
)); ));
} }
else if ($_GET['software'] == 'drush') { else if ($_GET['software'] == 'drush7') {
echo json_encode(array( echo json_encode(array(
$_GET['software'] => (($version = loadClass('Php')->getDrushVersion()) !== false) ? $version : $no $_GET['software'] => (($version = loadClass('Php')->getDrushVersion(7)) !== false) ? $version : $no
));
}
else if ($_GET['software'] == 'drush8') {
echo json_encode(array(
$_GET['software'] => (($version = loadClass('Php')->getDrushVersion(8)) !== false) ? $version : $no
));
}
else if ($_GET['software'] == 'drush9') {
echo json_encode(array(
$_GET['software'] => (($version = loadClass('Php')->getDrushVersion(9)) !== false) ? $version : $no
)); ));
} }
else if ($_GET['software'] == 'git') { else if ($_GET['software'] == 'git') {

16
.devilbox/www/htdocs/index.php
View File

@ -391,8 +391,16 @@ $HEALTH_PERCENT = 100 - ceil(100 * $HEALTH_FAILS / $HEALTH_TOTAL);
<td id="app_drupalc"></td> <td id="app_drupalc"></td>
</tr> </tr>
<tr> <tr>
<th>drush</th> <th>drush7</th>
<td id="app_drush"></td> <td id="app_drush7"></td>
</tr>
<tr>
<th>drush8</th>
<td id="app_drush8"></td>
</tr>
<tr>
<th>drush9</th>
<td id="app_drush9"></td>
</tr> </tr>
<tr> <tr>
<th>git</th> <th>git</th>
@ -907,7 +915,9 @@ $HEALTH_PERCENT = 100 - ceil(100 * $HEALTH_FAILS / $HEALTH_TOTAL);
} }
updateVersions('composer'); updateVersions('composer');
updateVersions('drupalc'); updateVersions('drupalc');
updateVersions('drush'); updateVersions('drush7');
updateVersions('drush8');
updateVersions('drush9');
updateVersions('git'); updateVersions('git');
updateVersions('laravel'); updateVersions('laravel');
updateVersions('mds'); updateVersions('mds');

4
.devilbox/www/include/lib/container/Php.php
View File

@ -45,9 +45,9 @@ class Php extends BaseClass implements BaseInterface
$output = loadClass('Helper')->exec('composer --version', $output); $output = loadClass('Helper')->exec('composer --version', $output);
return loadClass('Helper')->egrep('/[0-9.]+/', $output); return loadClass('Helper')->egrep('/[0-9.]+/', $output);
} }
public function getDrushVersion() public function getDrushVersion($version)
{ {
$output = loadClass('Helper')->exec('drush --version', $output); $output = loadClass('Helper')->exec('drush'.$version.' --version', $output);
return loadClass('Helper')->egrep('/[0-9.]+/', $output); return loadClass('Helper')->egrep('/[0-9.]+/', $output);
} }
public function getDrupalConsoleVersion() public function getDrupalConsoleVersion()