diff --git a/onebuttoninstaller/ext/onebuttoninstaller.php b/onebuttoninstaller/ext/onebuttoninstaller.php index 33a2d80..ed0bfff 100644 --- a/onebuttoninstaller/ext/onebuttoninstaller.php +++ b/onebuttoninstaller/ext/onebuttoninstaller.php @@ -61,6 +61,7 @@ function log_get_contents($logfile) { } function log_display($loginfo) { + global $g; global $config; global $savemsg; @@ -103,13 +104,13 @@ function log_display($loginfo) { // check if current architecture, plattform is supported // architectures: x86, x64, rpi // platforms: embedded, full, livecd, liveusb - if (!empty($result[6]) && (!(strpos($result[6], $arch) === false) || !(strpos($result[6], $platform) === false))) { - echo " \n"; + if (!empty($result[6]) && ((strpos($result[6], $g['arch']) !== false) || (strpos($result[6], $g['platform']) !== false))) { + echo " \n"; } else { // 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]}")))){ - echo " \n"; + echo " \n"; } else { // data for installation echo " diff --git a/onebuttoninstaller/onebuttoninstaller-install.php b/onebuttoninstaller/onebuttoninstaller-install.php index c1333c7..1fc032a 100644 --- a/onebuttoninstaller/onebuttoninstaller-install.php +++ b/onebuttoninstaller/onebuttoninstaller-install.php @@ -31,7 +31,7 @@ */ /* 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 0.1-b1 2016.01.28 real install/update from GitHub 0.1-a6 2016.01.28 include spinner with overlay