diff --git a/README.md b/README.md index d1f7a05..6047382 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ OneButtonInstaller ------------------ Description in the NAS4Free forum -> OneButtonInstaller + diff --git a/onebuttoninstaller/ext/ext/onebuttoninstaller/spinner.inc b/onebuttoninstaller/ext/ext/onebuttoninstaller/spinner.inc index ac04d3f..6c0fd8b 100644 --- a/onebuttoninstaller/ext/ext/onebuttoninstaller/spinner.inc +++ b/onebuttoninstaller/ext/ext/onebuttoninstaller/spinner.inc @@ -4,6 +4,8 @@ Copyright (c) 2015 - 2016 Andreas Schmidhuber All rights reserved. + Uses spin.js by Felix Gnass (fgnass) at http://spin.js.org + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/onebuttoninstaller/ext/onebuttoninstaller.php b/onebuttoninstaller/ext/onebuttoninstaller.php index 51a7202..9aee530 100644 --- a/onebuttoninstaller/ext/onebuttoninstaller.php +++ b/onebuttoninstaller/ext/onebuttoninstaller.php @@ -56,6 +56,22 @@ $loginfo = array( )) ); +// create FreeBSD $current_release for min_release check +$product_version = explode(".", get_product_version()); +$current_release = $product_version[0].".".$product_version[1].$product_version[2].$product_version[3].get_product_revision(); + +function check_min_release($min_release) { + global $current_release; + if (is_float(floatval($min_release))) { + if ($current_release < floatval($min_release)) return false; // release not supported + else return true; // release supported + } + else return true; // not a float, no release +} +//$sup="10.3032898"; // CHECK +//if (check_min_release($sup)) $savemsg .= "{$sup} = SUPPORTED"; +//else $savemsg .= "{$sup} = NOT SUPPORTED"; + function log_get_contents($logfile) { $content = array(); if (is_file($logfile)) exec("cat {$logfile}", $extensions); @@ -94,9 +110,7 @@ function log_display($loginfo) { $content = log_get_contents($loginfo['logfile']); if (empty($content)) return; sort($content); - $j = 0; - /* * EXTENSIONS.TXT format description: PARAMETER DELIMITER -> ### * PMID COMMENT @@ -106,9 +120,11 @@ function log_display($loginfo) { * command(list)1: 3 execution of SHELL commands / scripts (e.g. download installer, untar, chmod, ...) * command(list)2: 4 empty ("-") or PHP script name (file MUST exist) * description: 5 plain text which can include HTML tags - * unsupported 6 unsupported architecture, plattform + * unsupported 6 unsupported architecture, plattform, release + * architectures: x86, x64, rpi, rpi2, bananapi + * platforms: embedded, full, livecd, liveusb + * releases: 9.3, 10.2, 10.3032853, 10.3032898, 11.0, ... */ - // Create table data foreach ($content as $contentv) { // handle each line => one extension unset($result); @@ -117,26 +133,32 @@ function log_display($loginfo) { echo "\n"; for ($i = 0; $i < count($loginfo['columns']); $i++) { // handle pmids (columns) if ($i == count($loginfo['columns']) - 1) { - // check if current architecture, plattform is supported - // architectures: x86, x64, rpi - // platforms: embedded, full, livecd, liveusb - if (!empty($result[6]) && ((strpos($result[6], $g['arch']) !== false) || (strpos($result[6], $g['platform']) !== false))) { - echo " \n"; + // check if extension is already installed (existing config.xml or postinit cmd entry) + if ((isset($config[$result[2]])) || (log_get_status($result[2]) == 1)) { + echo " \n"; } - else { - // check if extension is already installed (existing config.xml or postinit cmd entry) - if ((isset($config[$result[2]])) || (log_get_status($result[2]) == 1)) { - echo " \n"; - } - else { // data for installation - echo " + else { // not installed + $supported_app = true; + if (!empty($result[6])) { // something unsupported exist + $unsupported = explode(",", str_replace(" ", "", $result[6])); + for ($k = 0; $k < count($unsupported); $k++) { // check for unsupported release / architecture / platforms + if (!check_min_release($unsupported[$k]) || ($unsupported[$k] == $g['arch']) || ($unsupported[$k] == $g['platform'])) { + echo " \n"; + $supported_app = false; + break; + } + } + } + if ($supported_app === true) { + // data for installation + echo " - \n"; - } // EOinstallation - } // EOsupported + \n"; + } + } // EOnot-installed } // EOcount else echo "" . $result[$loginfo['columns'][$i]['pmid']] . "\n"; } // EOcolumns @@ -209,7 +231,10 @@ bindtextdomain("nas4free", "/usr/local/share/locale-obi"); ?> ?>
- ".gettext("Some extensions need to finish their installation procedures on their own extension page before they will be shown as installed!")."");?> + ".gettext("Some extensions need to finish their installation procedures on their own extension page before they will be shown as installed!")."

");?> + +    
+    

" value="" onclick="return confirm('')" /> diff --git a/onebuttoninstaller/extensions.txt b/onebuttoninstaller/extensions.txt index f5a3e4f..15a0bdc 100644 --- a/onebuttoninstaller/extensions.txt +++ b/onebuttoninstaller/extensions.txt @@ -1,10 +1,9 @@ -Extended GUI###RELEASE
0.5.2.1###extended-gui###mkdir -p extended-gui/backup && mkdir -p extended-gui/log && cd extended-gui && fetch https://raw.github.com/crestAT/nas4free-extended-gui/master/extended-gui/extended-gui-install.php && chmod 770 extended-gui*install.php###extended-gui/extended-gui-install.php###Extension for NAS4Free with several improvements for the WebGUI and additional functions. Most of the extension affects STATUS | SYSTEM view but also STATUS | GRAPH and DIAGNOSTICS | LOG which got a new entry NOTIFICATIONS.

The extension works on all plattforms (x86 & x64, ARM, embedded & full), does not need jail or pkg_add, enhance pages of the NAS4Free WebGUI, features configuration and extension maintenance (update & removal inside the WebGUI), let you switch between STANDARD (original) and EXTENDED WebGUI view and let you easily configure/enable/disable views and additional functions.

Read more ... NAS4Free Forum -Downloady###RELEASE
0.1###downloady###mkdir -p downloady/log && cd downloady && fetch -v https://raw.github.com/crestAT/nas4free-downloady/master/downloady/downloady-install.php && chmod 770 downloady*install.php###downloady/downloady-install.php###Simple PHP download manager which is fully integrated into the NAS4Free WebGUI.

Downloady for NAS4Free is based on Downloady - the PHP Download Manager by CyberLeo@cyberLeo Projects and features downloads from http, https and ftp sites as well as download bandwith managment, resume downloads after system startup and a simple scheduler. The extension works on all plattforms (x86 & x64, ARM, embedded & full), does not need jail or pkg_add, enhance pages of the NAS4Free WebGUI and features configuration and extension maintenance. +Extended GUI###RELEASE
0.5.3###extended-gui###mkdir -p extended-gui/backup && mkdir -p extended-gui/log && cd extended-gui && fetch https://raw.github.com/crestAT/nas4free-extended-gui/master/extended-gui/extended-gui-install.php && chmod 770 extended-gui*install.php###extended-gui/extended-gui-install.php###Extension for NAS4Free with several improvements for the WebGUI and additional functions. Most of the extension affects STATUS | SYSTEM view but also STATUS | GRAPH and DIAGNOSTICS | LOG which got a new entry NOTIFICATIONS.

The extension works on all plattforms (x86 & x64, ARM, embedded & full), does not need jail or pkg_add, enhance pages of the NAS4Free WebGUI, features configuration and extension maintenance (update & removal inside the WebGUI), let you switch between STANDARD (original) and EXTENDED WebGUI view and let you easily configure/enable/disable views and additional functions.

Read more ... NAS4Free Forum###10.3032853 RRDGraphs###RELEASE
0.3.2###rrdgraphs###mkdir -p rrdgraphs && cd rrdgraphs && fetch https://raw.github.com/crestAT/nas4free-rrdtool/master/rrdgraphs/rrd-install.php && chmod 770 rrd*install.php###rrdgraphs/rrd-install.php###Extension to install / configure / update and remove RRDTool based graphs for NAS4Free servers.

The extension is based on RRDtool and provides graphs for CPU frequency, CPU temperature, CPU usage, Disk usage (recognition of all mountpoints/shares automatically at RRDG startup), Load averages, Memory usage, Network latency, Network traffic, Processes, UPS, Uptime and ZFS ARC.

The extension is compatible with all versions (9.1.x - 10.x) of NAS4Free except on ARM boxes and works on all plattforms (x86 & x64, embedded & full), does not need jail or pkg_add, add pages to NAS4Free Web GUI extensions, features configuration and extension maintenance (update & removal inside the WebGUI) and is able to work on RAM drives to take care of your HDDs/USB pen drives.

Read more ... NAS4Free Forum BitTorrent Sync###RELEASE
0.7###btsync###fetch https://raw.github.com/crestAT/nas4free-bittorrent-sync/master/bts-install.php && chmod 770 bts*install.php###bts-install.php###Extension to install / configure / backup / update / manage and remove BitTorrent Sync application on NAS4Free servers.

The extension can be used with BitTorrent Sync 1.4.x (last version was 1.4.111) as well as 2.x, is compatible with all versions (9.1.x - 10.x) of NAS4Free except on ARM boxes, works on all plattforms (embedded, full), does not need jail or pkg_add, add pages to NAS4Free Web GUI extensions, features configuration, application update & backup management, extension mantenance (update & removal) and log view with filter and search capability.

Note: Standard BitTorrent Sync version is based on 2.x releases, to use the latest 1.x release open Extensions | BitTorrent Sync | Maintenance and change the Download URL for version 1.4.111:
64 bit: http://syncapp.bittorrent.com/1.4.111/btsync_freebsd_x64-1.4.111.tar.gz
32 bit: http://syncapp.bittorrent.com/1.4.111/btsync_freebsd_i386-1.4.111.tar.gz
and hit Save URL, Fetch and Install.

Read more ... NAS4Free Forum###rpi, rpi2 -Syncthing###RELEASE
0.1.5###syncthing###fetch https://raw.github.com/crestAT/nas4free-syncthing/master/stg-install.php && chmod 770 stg*install.php###stg-install.php###Extension to install / configure / backup / update / manage and remove Syncthing (STG) application on NAS4Free (N4F) servers.

The extension works on all plattforms, does not need jail or pkg_add, add pages to NAS4Free WebGUI extensions, features configuration, application update & backup management, scheduling and log view with filter / search capabilities.

Read more ... NAS4Free Forum###rpi, rpi2 +Syncthing###RELEASE
0.1.5###syncthing###fetch https://raw.github.com/crestAT/nas4free-syncthing/master/stg-install.php && chmod 770 stg*install.php###stg-install.php###Extension to install / configure / backup / update / manage and remove Syncthing (STG) application on NAS4Free (N4F) servers.

The extension works on all plattforms, does not need jail or pkg_add, add pages to NAS4Free WebGUI extensions, features configuration, application update & backup management, scheduling and log view with filter / search capabilities.

Note: The current 10.3 and 10.2 series of NAS4Free contain Syncthing already out of the box so this extensions is mainly for older releases OR if one need older Syncthing versions (e.g. before 0.14.x for compatibility reasons with other devices.

Read more ... NAS4Free Forum### TheBrig###RELEASE
0.94###thebrig###mkdir -p thebrig && cd thebrig && fetch https://raw.githubusercontent.com/fsbruva/thebrig/alcatraz/thebrig_install.sh && chmod a+x thebrig_install.sh && sh thebrig_install.sh###-###Jail manager extension for NAS4Free.

Note: After the installation navigate to rudimentary config tab and push Save to finish the installation.

Read more ... NAS4Free Forum DNSMasq DHCP Server###RELEASE
0.3###dnsmasq###mkdir -p dnsmasq && cd dnsmasq && fetch https://raw.github.com/alexey1234/nas4free-dnsmasq/master/dnsmasq_install.sh && chmod a+x dnsmasq_install.sh && sh dnsmasq_install.sh `pwd`###-###DNSMasq DHCP Server extension for NAS4Free.

Note: After the installation navigate to rudimentary config tab and push Save to finish the installation.

Read more ... NAS4Free Forum###rpi, rpi2 Midnight Commander###RELEASE
4.8.8###mcommander.sh###mkdir -p midnightcommander && cd midnightcommander && cp /usr/local/www/ext/onebuttoninstaller/mcommander.* . && chmod u+x mcommander.sh && `pwd`/mcommander.sh###midnightcommander/mcommander.postinit###Midnight Commander for NAS4Free.

After successful installation you can use Midnight Commander in the system console shell or if you connect via ssh. To start the Midnight Commander just enter the command mc in the CLI.

Read more ... NAS4Free Forum###rpi, rpi2 -Bhyve###BETA
0.x###bhyve###mkdir -p bhyve && cd bhyve && fetch https://raw.githubusercontent.com/alexey1234/vmbhyve_nas4free/master/bhyve_install.sh && chmod a+x bhyve_install.sh && sh bhyve_install.sh `pwd`###-###WebGUI for bhyve for NAS4Free.

Note: After the installation navigate to rudimentary config tab and push Save to finish the installation.

Read more ... NAS4Free Forum -Plex Media Server###RELEASE
4.0###plexinit###cd plex && ./plexinit -o###plex/postinit###Plex Media Server Add-On for NAS4Free 10.x.

The extension works on NAS4Free Plex Media Server Add-On for NAS4Free 10.x or compatible FreeBSD based NAS solutions, don't need jail, fstab or unionfs configs, self contained and portable package, single script for management and startup, easy to upgrade/rollback while maintaining actual Plex config, Plex IP address will be locally visible by any devices.

Read more ... NAS4Free Forum###x86, rpi, rpi2 +Virtual Machine BHYVE###BETA
0.x###bhyve###mkdir -p bhyve && cd bhyve && fetch https://raw.githubusercontent.com/alexey1234/vmbhyve_nas4free/master/bhyve_install.sh && chmod a+x bhyve_install.sh && sh bhyve_install.sh `pwd`###-###Webgui to bhyve for NAS4Free. Based on vm-bhyve.

Note: After the installation navigate to rudimentary config tab and push Save to finish the installation.

Read more ... NAS4Free Forum###10.2, rpi, rpi2, bananapi +Plex Media Server###RELEASE
4.1###plexinit###mkdir -p plex && cd plex && fetch https://raw.githubusercontent.com/JRGTH/nas4free-plex-extension/master/plex/plexinit && chmod 0755 plexinit && plexinit -o###plex/postinit###Plex Media Server Add-On for NAS4Free 10.x.

The extension works on NAS4Free Plex Media Server Add-On for NAS4Free 10.x or compatible FreeBSD based NAS solutions, don't need jail, fstab or unionfs configs, self contained and portable package, single script for management and startup, easy to upgrade/rollback while maintaining actual Plex config, Plex IP address will be locally visible by any devices.

Read more ... NAS4Free Forum###x86, 10.0, rpi, rpi2 diff --git a/onebuttoninstaller/locale-obi/de/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/de/LC_MESSAGES/nas4free.mo index 799b1c7..520cfe4 100644 Binary files a/onebuttoninstaller/locale-obi/de/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-obi/de/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/onebuttoninstaller-install.php b/onebuttoninstaller/onebuttoninstaller-install.php index 144e59c..89f376e 100644 --- a/onebuttoninstaller/onebuttoninstaller-install.php +++ b/onebuttoninstaller/onebuttoninstaller-install.php @@ -29,7 +29,7 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -$v = "v0.1-b7"; // extension version +$v = "v0.1"; // extension version $appname = "OneButtonInstaller"; require_once("config.inc"); diff --git a/onebuttoninstaller/release_notes.txt b/onebuttoninstaller/release_notes.txt index c742d7e..4741029 100644 --- a/onebuttoninstaller/release_notes.txt +++ b/onebuttoninstaller/release_notes.txt @@ -1,12 +1,5 @@ Version Date Description -0.1-b7 2016.07.23 N: OBI extension installer -0.1-b6 2016.06.16 N: recognition of extensions without GUI / config.xml entries -0.1-b4 2016.04.07 C: 2451 compatibility -0.1-b3 2016.02.06 N: add language support -0.1-b2 2016.02.01 N: check for supported architecture, plattform - N: auto update of extensions list -0.1-b1 2016.01.29 beta release -0.1-a1 2016.01.19 alpha release +0.1 2016.08.01 initial release N: ... new feature C: ... changes diff --git a/onebuttoninstaller/version.txt b/onebuttoninstaller/version.txt index 6a97bb5..49d5957 100644 --- a/onebuttoninstaller/version.txt +++ b/onebuttoninstaller/version.txt @@ -1 +1 @@ -0.1-b7 +0.1