diff --git a/onebuttoninstaller/ext/onebuttoninstaller-config.php b/onebuttoninstaller/ext/onebuttoninstaller-config.php index 625fdeb..6bef4e2 100644 --- a/onebuttoninstaller/ext/onebuttoninstaller-config.php +++ b/onebuttoninstaller/ext/onebuttoninstaller-config.php @@ -90,6 +90,7 @@ function change_perms($dir) { if (!is_dir($config['onebuttoninstaller']['storage_path'])) mkdir($config['onebuttoninstaller']['storage_path'], 0775, true); change_perms($_POST['storage_path']); $config['onebuttoninstaller']['path_check'] = isset($_POST['path_check']) ? true : false; + $config['onebuttoninstaller']['re_install'] = isset($_POST['re_install']) ? true : false; $config['onebuttoninstaller']['auto_update'] = isset($_POST['auto_update']) ? true : false; $config['onebuttoninstaller']['show_beta'] = isset($_POST['show_beta']) ? true : false; $savemsg .= get_std_save_message(write_config())." "; @@ -103,6 +104,7 @@ function change_perms($dir) { $pconfig['enable'] = isset($config['onebuttoninstaller']['enable']) ? true : false; $pconfig['storage_path'] = !empty($config['onebuttoninstaller']['storage_path']) ? $config['onebuttoninstaller']['storage_path'] : $g['media_path']; $pconfig['path_check'] = isset($config['onebuttoninstaller']['path_check']) ? true : false; +$pconfig['re_install'] = isset($config['onebuttoninstaller']['re_install']) ? true : false; $pconfig['auto_update'] = isset($config['onebuttoninstaller']['auto_update']) ? true : false; $pconfig['show_beta'] = isset($config['onebuttoninstaller']['show_beta']) ? true : false; @@ -122,6 +124,7 @@ function enable_change(enable_change) { document.iform.storage_path.disabled = endis; document.iform.storage_pathbrowsebtn.disabled = endis; document.iform.path_check.disabled = endis; + document.iform.re_install.disabled = endis; document.iform.auto_update.disabled = endis; document.iform.show_beta.disabled = endis; } @@ -149,6 +152,7 @@ function enable_change(enable_change) { /mnt/)."), $pconfig['storage_path'], true, 60);?> ".gettext("Please use this option only if you know what you are doing!")."", false);?> + ".gettext("Please use this option only if you know what you are doing!")."", false);?> diff --git a/onebuttoninstaller/ext/onebuttoninstaller.php b/onebuttoninstaller/ext/onebuttoninstaller.php index b28d41a..6045ed2 100644 --- a/onebuttoninstaller/ext/onebuttoninstaller.php +++ b/onebuttoninstaller/ext/onebuttoninstaller.php @@ -135,34 +135,33 @@ function log_display($loginfo) { if (!isset($config['onebuttoninstaller']['show_beta']) && (strpos($result[1], "RELEASE") === false)) continue; //check for beta state else { if ($i == count($loginfo['columns']) - 1) { - - + 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"; + break; + } + } + } // check if extension is already installed (existing config.xml or postinit cmd entry) + $already_installed = false; +echo " \n"; +// echo " \n"; + echo "> \n"; - $supported_app = false; - break; - } - } - } - if ($supported_app === true) { - // data for installation - echo " - - - - - \n"; - } - } // EOnot-installed + if (($already_installed === false) || isset($config['onebuttoninstaller']['re_install']) ) { + // data for installation +// echo " + echo "> + + + "; +// \n"; + } +echo "\n"; } // EOcount else echo "" . $result[$loginfo['columns'][$i]['pmid']] . "\n"; } //EObeta-check @@ -215,6 +214,7 @@ function log_display($loginfo) { } //EOversion-check if (!is_file("{$config['onebuttoninstaller']['rootfolder']}extensions.txt")) $errormsg .= sprintf(gettext("File %s not found!"), "{$config['onebuttoninstaller']['rootfolder']}extensions.txt")."
"; +if (isset($config['onebuttoninstaller']['re_install'])) $savemsg .= sprintf(gettext("Option '%s' in '%s' is enabled!"), gettext("Re-install"), gettext("Configuration")); bindtextdomain("nas4free", "/usr/local/share/locale"); // to get the right main menu language include("fbegin.inc"); diff --git a/onebuttoninstaller/extensions.txt b/onebuttoninstaller/extensions.txt index df33fb3..54796ee 100644 --- a/onebuttoninstaller/extensions.txt +++ b/onebuttoninstaller/extensions.txt @@ -7,3 +7,4 @@ DNSMasq DHCP Server###RELEASE
0.3###dnsmasq###mkdi 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, rpi3, bananapi### 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###x86, 10.2, rpi, rpi2, rpi3, 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 755 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, rpi3, bananapi### +Extended GUI###BETA
0.6-b1###extended-gui-devel###mkdir -p extended-gui/backup && mkdir -p extended-gui/log && cd extended-gui && fetch https://raw.github.com/crestAT/nas4free-extended-gui/development/extended-gui/extended-gui-install.php && chmod 770 extended-gui*install.php###extended-gui/extended-gui-install.php###

This is a development version, use it only for testing!

Resolved issues in v0.6-b1:

Pools duplication:
=> http://forums.nas4free.org/viewtopic.php?p=66903#p66903
=> http://forums.nas4free.org/viewtopic.php?f=71&t=6405&start=390#p67189

Dataset names:
=> http://forums.nas4free.org/viewtopic.php?f=71&t=6405&start=390#p68026
=> http://forums.nas4free.org/viewtopic.php?f=71&t=6405&start=420#p70077

Note 1: THIS BETA VERSION SHOWS NEVER TO BE INSTALLED THUS IT IS POSSIBLE TO INSTALL NEWER BETA VERSIONS !
Note 2: One can revert to the most recent release of eGUI at any time via the WebGUI | Extensions | Extended GUI | Extension Maintenance => Update extension.


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.

Read more ... NAS4Free Forum###10.3032853### diff --git a/onebuttoninstaller/locale-obi/de/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/de/LC_MESSAGES/nas4free.mo index 67b0889..50220b7 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/locale-obi/el/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/el/LC_MESSAGES/nas4free.mo index ac3044b..ff5c4cf 100644 Binary files a/onebuttoninstaller/locale-obi/el/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-obi/el/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-obi/es/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/es/LC_MESSAGES/nas4free.mo index 5bed396..54c20b9 100644 Binary files a/onebuttoninstaller/locale-obi/es/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-obi/es/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-obi/fr/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/fr/LC_MESSAGES/nas4free.mo index eb23f83..0428ebe 100644 Binary files a/onebuttoninstaller/locale-obi/fr/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-obi/fr/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-obi/it/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/it/LC_MESSAGES/nas4free.mo index e0e093f..27092fd 100644 Binary files a/onebuttoninstaller/locale-obi/it/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-obi/it/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-obi/nl/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/nl/LC_MESSAGES/nas4free.mo index 6c9d8d9..b8a7dbf 100644 Binary files a/onebuttoninstaller/locale-obi/nl/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-obi/nl/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-obi/ro/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/ro/LC_MESSAGES/nas4free.mo index ff90122..0b65fa9 100644 Binary files a/onebuttoninstaller/locale-obi/ro/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-obi/ro/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-obi/ru/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/ru/LC_MESSAGES/nas4free.mo index d80257c..f89809d 100644 Binary files a/onebuttoninstaller/locale-obi/ru/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-obi/ru/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-obi/sv/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/sv/LC_MESSAGES/nas4free.mo new file mode 100644 index 0000000..a4855ba Binary files /dev/null and b/onebuttoninstaller/locale-obi/sv/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/onebuttoninstaller-install.php b/onebuttoninstaller/onebuttoninstaller-install.php index a9ec909..bb43435 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.3.1"; // extension version +$v = "v0.3.2"; // extension version $appname = "OneButtonInstaller"; require_once("config.inc"); diff --git a/onebuttoninstaller/release_notes.txt b/onebuttoninstaller/release_notes.txt index 8bdef1b..85a4be0 100644 --- a/onebuttoninstaller/release_notes.txt +++ b/onebuttoninstaller/release_notes.txt @@ -1,4 +1,8 @@ Version Date Description +0.3.2 2016.08.25 N: configuration - add checkbox to enable the installation of extensions even if they are already installed + N: Swedish translation + C: update Greek translation + C: update German translation 0.3.1 2016.08.15 F: OBI installer - add checkbox to override restriction for extensions installation path 0.3 2016.08.14 N: configuration - checkbox to override restriction for extensions installation path (limited to a directory under /mnt/) diff --git a/onebuttoninstaller/version.txt b/onebuttoninstaller/version.txt index 9e11b32..d15723f 100644 --- a/onebuttoninstaller/version.txt +++ b/onebuttoninstaller/version.txt @@ -1 +1 @@ -0.3.1 +0.3.2