Xigmanas/onebuttoninstaller
1
0
Fork 0
Code Pull Requests Activity

beta 2

Browse Source
This commit is contained in:
crestAT
2016-02-02 04:30:55 +01:00
parent 6412d71f14
commit 82f1aaba5e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
onebuttoninstaller/ext/onebuttoninstaller.php
View File

@@ -61,6 +61,7 @@ function log_get_contents($logfile) {
} }
function log_display($loginfo) { function log_display($loginfo) {
global $g;
global $config; global $config;
global $savemsg; global $savemsg;
@@ -103,13 +104,13 @@ function log_display($loginfo) {
// check if current architecture, plattform is supported // check if current architecture, plattform is supported
// architectures: x86, x64, rpi // architectures: x86, x64, rpi
// platforms: embedded, full, livecd, liveusb // platforms: embedded, full, livecd, liveusb
if (!empty($result[6]) && (!(strpos($result[6], $arch) === false) || !(strpos($result[6], $platform) === false))) { if (!empty($result[6]) && ((strpos($result[6], $g['arch']) !== false) || (strpos($result[6], $g['platform']) !== false))) {
echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'> <img src='status_disabled.png' border='0' alt='' title='".gettext('Unsupported architecture/platform')."' /> </td>\n"; echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'> <img src='status_disabled.png' border='0' alt='' title='".gettext('Unsupported architecture/platform')."' /></td>\n";
} }
else { else {
// check if extension is already installed (existing config.xml entry or, for command line tools, based on installation directory) // check if extension is already installed (existing config.xml entry or, for command line tools, based on installation directory)
if ((isset($config[$result[2]])) || ((strpos($result[2], "/") == 0) && (is_dir("{$config['onebuttoninstaller']['storage_path']}{$result[2]}")))){ if ((isset($config[$result[2]])) || ((strpos($result[2], "/") == 0) && (is_dir("{$config['onebuttoninstaller']['storage_path']}{$result[2]}")))){
echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'> <img src='status_enabled.png' border='0' alt='' title='".gettext('Enabled')."' /> </td>\n"; echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'> <img src='status_enabled.png' border='0' alt='' title='".gettext('Enabled')."' /></td>\n";
} }
else { // data for installation else { // data for installation
echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'> echo "<td {$loginfo['columns'][$i]['param']} class='{$loginfo['columns'][$i]['class']}'>

2
onebuttoninstaller/onebuttoninstaller-install.php
View File

@@ -31,7 +31,7 @@
*/ */
/* /*
Version Date Description Version Date Description
0.1-b2 2016.02.01 N: check for supported architecture, plattform 0.1-b2 2016.02.02 N: check for supported architecture, plattform
N: auto update of extensions list N: auto update of extensions list
0.1-b1 2016.01.28 real install/update from GitHub 0.1-b1 2016.01.28 real install/update from GitHub
0.1-a6 2016.01.28 include spinner with overlay 0.1-a6 2016.01.28 include spinner with overlay