From 6b18289fc6ecd43dc847743cc299c5455d334874 Mon Sep 17 00:00:00 2001 From: crestAT Date: Tue, 9 Aug 2016 08:19:14 +0200 Subject: [PATCH] v0.2 N: configuration - enable/disable beta releases in extensions list N: check hardware platform to use midnightcommander on i386 too F: disabling extension not possible, leads to an error message --- .../ext/onebuttoninstaller/fail2ban.postinit | 13 ++++ .../ext/ext/onebuttoninstaller/mcommander.sh | 4 +- .../ext/onebuttoninstaller-config.php | 29 +++++--- onebuttoninstaller/ext/onebuttoninstaller.php | 63 ++++++++++-------- onebuttoninstaller/extensions.txt | 18 ++--- .../extensions.txt.SHA512-CHECKSUM | 2 +- .../locale-obi/de/LC_MESSAGES/nas4free.mo | Bin 8698 -> 7896 bytes .../locale-obi/el/LC_MESSAGES/nas4free.mo | Bin 5434 -> 5434 bytes .../locale-obi/es/LC_MESSAGES/nas4free.mo | Bin 2572 -> 2459 bytes .../locale-obi/fr/LC_MESSAGES/nas4free.mo | Bin 2703 -> 2703 bytes .../locale-obi/it/LC_MESSAGES/nas4free.mo | Bin 2322 -> 2322 bytes .../locale-obi/nl/LC_MESSAGES/nas4free.mo | Bin 2383 -> 2291 bytes .../locale-obi/ro/LC_MESSAGES/nas4free.mo | Bin 2606 -> 2513 bytes .../locale-obi/ru/LC_MESSAGES/nas4free.mo | Bin 3272 -> 3272 bytes .../onebuttoninstaller-install.php | 2 +- .../onebuttoninstaller-start.php | 4 +- onebuttoninstaller/release_notes.txt | 3 + onebuttoninstaller/version.txt | 2 +- 18 files changed, 85 insertions(+), 55 deletions(-) create mode 100644 onebuttoninstaller/ext/ext/onebuttoninstaller/fail2ban.postinit diff --git a/onebuttoninstaller/ext/ext/onebuttoninstaller/fail2ban.postinit b/onebuttoninstaller/ext/ext/onebuttoninstaller/fail2ban.postinit new file mode 100644 index 0000000..707fc93 --- /dev/null +++ b/onebuttoninstaller/ext/ext/onebuttoninstaller/fail2ban.postinit @@ -0,0 +1,13 @@ + diff --git a/onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.sh b/onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.sh index ba9a9a6..bbda062 100644 --- a/onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.sh +++ b/onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.sh @@ -10,12 +10,14 @@ # date: 2013-08-23 ; Fetch files from packages-9.2-release ; add libssh2 # date: 2014-12-18 ; Update for v9.3; Clean up # date: 2015-02-21 ; Update mc package to mc-4.8.11.tbz +# date: 2016-08-04 ; check hardware platform to use it on i386 too - author: crest # purpose: Install Midnight Commander on NAS4Free (embedded version). # Note: Check the end of the page. # #----------------------- Set variables ------------------------------------------------------------------ DIR=`dirname $0`; -URL="ftp://ftp-archive.freebsd.org/pub/FreeBSD-Archive/ports/amd64/packages-9.2-release/Latest" +HWPLATFORM=`uname -m`; +URL="ftp://ftp-archive.freebsd.org/pub/FreeBSD-Archive/ports/${HWPLATFORM}/packages-9.2-release/Latest" MCLIGHTFILE="mc.tbz" LIBSLANGFILE="libslang2.tbz" LIBSSH2FILE="libssh2.tbz" diff --git a/onebuttoninstaller/ext/onebuttoninstaller-config.php b/onebuttoninstaller/ext/onebuttoninstaller-config.php index f9a9379..71ae02a 100644 --- a/onebuttoninstaller/ext/onebuttoninstaller-config.php +++ b/onebuttoninstaller/ext/onebuttoninstaller-config.php @@ -80,23 +80,28 @@ if (isset($_POST['save']) && $_POST['save']) { unset($input_errors); if (empty($input_errors)) { $config['onebuttoninstaller']['enable'] = isset($_POST['enable']) ? true : false; - $config['onebuttoninstaller']['storage_path'] = !empty($_POST['storage_path']) ? $_POST['storage_path'] : $g['media_path']; - $config['onebuttoninstaller']['storage_path'] = rtrim($config['onebuttoninstaller']['storage_path'],'/'); // ensure to have NO trailing slash - if (strpos($config['onebuttoninstaller']['storage_path'], "/mnt/") === false) { - $input_errors[] = gettext("The common directory for all extensions MUST be set to a directory below '/mnt/' to prevent to loose the extensions after a reboot on embedded systems!"); - } - else { - if (!is_dir($config['onebuttoninstaller']['storage_path'])) mkdir($config['onebuttoninstaller']['storage_path'], 0775, true); - change_perms($_POST['storage_path']); - $config['onebuttoninstaller']['auto_update'] = isset($_POST['auto_update']) ? true : false; - $savemsg .= get_std_save_message(write_config()); + if (isset($_POST['enable'])) { + $config['onebuttoninstaller']['storage_path'] = !empty($_POST['storage_path']) ? $_POST['storage_path'] : $g['media_path']; + $config['onebuttoninstaller']['storage_path'] = rtrim($config['onebuttoninstaller']['storage_path'],'/'); // ensure to have NO trailing slash + if (strpos($config['onebuttoninstaller']['storage_path'], "/mnt/") === false) { + $input_errors[] = gettext("The common directory for all extensions MUST be set to a directory below '/mnt/' to prevent to loose the extensions after a reboot on embedded systems!"); + } + else { + if (!is_dir($config['onebuttoninstaller']['storage_path'])) mkdir($config['onebuttoninstaller']['storage_path'], 0775, true); + change_perms($_POST['storage_path']); + $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()); + } } + else $savemsg .= get_std_save_message(write_config()); } // end of empty input_errors } $pconfig['enable'] = isset($config['onebuttoninstaller']['enable']) ? true : false; $pconfig['storage_path'] = !empty($config['onebuttoninstaller']['storage_path']) ? $config['onebuttoninstaller']['storage_path'] : $g['media_path']; $pconfig['auto_update'] = isset($config['onebuttoninstaller']['auto_update']) ? true : false; +$pconfig['show_beta'] = isset($config['onebuttoninstaller']['show_beta']) ? true : false; bindtextdomain("nas4free", "/usr/local/share/locale"); // to get the right main menu language include("fbegin.inc"); @@ -108,6 +113,7 @@ function enable_change(enable_change) { document.iform.storage_path.disabled = endis; document.iform.storage_pathbrowsebtn.disabled = endis; document.iform.auto_update.disabled = endis; + document.iform.show_beta.disabled = endis; } //--> @@ -130,9 +136,10 @@ function enable_change(enable_change) { - + /mnt/)."), $pconfig['storage_path'], true, 60);?> +
"/> diff --git a/onebuttoninstaller/ext/onebuttoninstaller.php b/onebuttoninstaller/ext/onebuttoninstaller.php index ff2e710..a06e9f7 100644 --- a/onebuttoninstaller/ext/onebuttoninstaller.php +++ b/onebuttoninstaller/ext/onebuttoninstaller.php @@ -115,7 +115,7 @@ function log_display($loginfo) { * EXTENSIONS.TXT format description: PARAMETER DELIMITER -> ### * PMID COMMENT * name: 0 extension name - * version: 1 extension version (base for config entry - could change for newer versions) + * version: 1 extension version (base for config entry - could change for newer versions), check for beta releases * xmlstring: 2 config.xml or installation directory * 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) @@ -132,35 +132,40 @@ function log_display($loginfo) { if ((FALSE === $result) || (0 == $result)) continue; echo "\n"; for ($i = 0; $i < count($loginfo['columns']); $i++) { // handle pmids (columns) - if ($i == count($loginfo['columns']) - 1) { - // 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 { // 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 (!isset($config['onebuttoninstaller']['show_beta']) && (strpos($result[1], "RELEASE") === false)) continue; //check for beta state + else { + if ($i == count($loginfo['columns']) - 1) { + + + // 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 { // 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"; - } - } // EOnot-installed - } // EOcount - else echo "" . $result[$loginfo['columns'][$i]['pmid']] . "\n"; + } + if ($supported_app === true) { + // data for installation + echo " + + + + + \n"; + } + } // EOnot-installed + } // EOcount + else echo "" . $result[$loginfo['columns'][$i]['pmid']] . "\n"; + } //EObeta-check } // EOcolumns echo "\n"; $j++; diff --git a/onebuttoninstaller/extensions.txt b/onebuttoninstaller/extensions.txt index 71b7896..df33fb3 100644 --- a/onebuttoninstaller/extensions.txt +++ b/onebuttoninstaller/extensions.txt @@ -1,9 +1,9 @@ -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, rpi3, bananapi -Syncthing###RELEASE
0.1.5###syncthing_start.php###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, rpi3, bananapi -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###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, rpi3, bananapi### +Syncthing###RELEASE
0.1.5###syncthing_start.php###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, rpi3, bananapi### +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### diff --git a/onebuttoninstaller/extensions.txt.SHA512-CHECKSUM b/onebuttoninstaller/extensions.txt.SHA512-CHECKSUM index a1af984..0645c26 100644 --- a/onebuttoninstaller/extensions.txt.SHA512-CHECKSUM +++ b/onebuttoninstaller/extensions.txt.SHA512-CHECKSUM @@ -1 +1 @@ -8d352ed5bc4b8261b89ea385b89a600096642264d9c73feaa61e2ec38d951ecccc9dfb38e6c6235cbf65276df2ffc3ccc872ddc19a1d964cdeba80137103715a +c143308bd6f18d8d4c42c1daaab553cb1eeadca1e89db29909b93dfb80b0dc69ed5ea3e5cc91813f3598a9edf414750a101e2a0449d945eedeb448f1252a6132 diff --git a/onebuttoninstaller/locale-obi/de/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/de/LC_MESSAGES/nas4free.mo index 92420158afbfbf1e9e0ef4987421ed26f7397357..b62fda1424d7ed809033a99e564bee8b1f3543e4 100644 GIT binary patch delta 1554 zcmYk+TWAzl9LMpq#%5z|jERZa#%Ly9+GrCKt#KRg7nCXz3*rVNZCTAx2RDdZ*_G8@CQ6d70zIc@jpbj5N8sVGGB)Z zv<(x?`v&#>+pMk!-oaxygr8y?(OtwowD=K=+`tUZUVu#;m~O z7}tGNAb(~!(H1mPAC+tss?-Twiih!Iyot*A2@+?nE$67L)f{@GPV!9;*Osa&uw`^@ zkzUk^rsrf-)}s6sl}t@a7e5zdGwKCgM5lncE!4i((OcP)aKIl$28GYzQuHHoBpFdqfn^Y+^ z{cN?3+Ux(?`h9^-JATjJz1H``bYXwV1{)-uv`yKhZ~bgx^m1g&KF4~=Jt^DS;Mng1 z>-lcC=R2P|A@rft>-z(gMoY4 zwdtV2>9y%j>p7d!z1Ah49&bM*x69G@8+QcBPPeCvn8HV~*~Lk2_E~p7(HyJtvTI`J VqtiWSf$|}fR7xvmf3F>j{0lW4%_{%^ delta 1504 zcmX}sOGs2v9LMqh&Bu(DW|Nwg1TXoO|xvbI$*N&YidG{%(#B1u`!h zrG{EU{ppz1<3I*q6n~akBYim-;o8kMtH9UD$INGzFYp)^V=i9833v-<;C<8_1Gpaj z{^av%tCk%=i?x5$6vS3A|HFhmooGj z%kU4DVkxUp#x@{xTP@yT!81fm69Ygj)G|)Bs^-QOeh% zCaA;J7{Nxoi6qVbAxW_u29bq04MV7LYNnF^Sv2bCP>S171E0X@crJB)H+BC3^0C)^ z)#Ddr&9;h%Ns?_vMYXw$sIC2r4+%VX8u?f1UocxWj-XOGnXS^ab?G>KI5!CYsXEF(1#uzpc)pLA<+R96$X*oVdowe_H088URvo$m>;3^zI zEhIBEdRo_^QnnR&#`d8GI)&x<2o>>1WIOFEI;f~MUIkT!ZVM+{qhCuv^TyMCD`+V7 zWOS?qX(_#moWN`fwT7w`Dyo%KEoK~52T}{t0ZkX}c_nojm7|b+3&?zO@AWFq*8EDh ziqfKzK~+SGR(q&wpbTCzfkLEp7(C!A={JL=>{ zJG+CCXso-rz1?l~h9@=pmIo`U*Hl${wfUh`yDHI{KiwI}&?QBEj(2AAtDH@H_jb80 zZEn=-2^1%K0zVvYu%N@&+#TtR##+7Vf)cMHP@bqNyy~0T5o~a~j=GVSwrC_4EQ_V* Wi@06g;l!tsUrr#(&9QZ;-~IzV46)k) diff --git a/onebuttoninstaller/locale-obi/el/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/el/LC_MESSAGES/nas4free.mo index bb6c85bf0b097b6e2cf1654a73f74d45ad085fae..b554b3f30e500ef72ae25017e8cccc1f7c4e9079 100644 GIT binary patch delta 38 lcmdm`wM%QmVGb?}T?0!619K}=qseDEv(q3eo@o delta 38 mcmdm`wM%QmVGb^HT_a-!19K}Q!^vkkyEV-`O!gWtGj)-*3}=JLZP>Vh5A0f$(|Gu+1>E@GO^ zJZLpsz!qx%4J!Bpb_xHE0qYae>B1f=_&rwf1%2)}cla-P29=O(4g?c`oFson**Rg?mkxSggr@^|+xQg6wTYS-mBh=J&iASpl*)PtvJgpJ` zm)@GQEJZ7bYMf?J{nAS)xTdOLsx-~y`xDV$?kl+}8&#Z?6K%Wmv1Gjxtjq<=VXfLZ T_htsmdKd)JomY!@GXBpmPE9U6 delta 678 zcmX}pOG`pQ6u|N0tIS6a?L~>*AbU`PkHV}?U!VwrXsalAAxyX~YLkmvx~XteLeNLZ z4-nMGRkaNwTD54^CTLgxW48{>{mqQdoHH{Q;rd|hCFE`hF-nWjo@p^!)4_*GIBA%~ zAm(u#E4Yev?7}wo-~;yK6Z-HShw&2!FyIpD#VBry)Fe*F&BP&Uf+N%oPH-Ntu!#3K ziHrPs7PpZNq=qy2h`R0zC$PsO(%=wtm|%QEm74ei^#I?PBEO7x|5m{XCB@2+ zJ;#lSv^-9~Gg92I7R#2oS2j$`Fw0gox4T;`&@*CI%jaHj_%iWS+DK$pQpvM5PxOD7 j&bCUPCD&BWu(!Btm5ox)u*|}qy-}{fkDZOqy$;6@=w?Zy diff --git a/onebuttoninstaller/locale-obi/fr/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/fr/LC_MESSAGES/nas4free.mo index cd916a1cf301386f3eaad9624ddc588b09bad65d..b90e8d9c1e203b712064e17ad31bb425ea6070ff 100644 GIT binary patch delta 37 ocmeAd?HAp!mX*sw*T7Q2z}(8zX!3SeIZg=I!pdOtJ=TpZ0Kk6=EC2ui delta 37 mcmeAd?HAp!mX*s~*T`7Gz}(8naPoFmIZhbYWb-}NjVu7afeIl2 diff --git a/onebuttoninstaller/locale-obi/it/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/it/LC_MESSAGES/nas4free.mo index fec2e44a46d2425826bc80fcc03f56c4110e5a47..0b5b328a773a01847d4b099a663a0b61bfadc9fa 100644 GIT binary patch delta 37 ncmbOvG)ZUyE0=|?fu(|hxs|EWWG+@YDA&Tuz;Lq>>jP#0pd1Kx delta 37 lcmbOvG)ZUyE0?*hk+Fh-xs{ROWG+@YIM>8rvk~h9W&ocJ2xvXAFu?2F&0q}s}!QO2ud`8R2Q%iC0L6#LD9n2 z#zwd=5Ud5YGL=}_35p*;|FdRb?w1L-yEA)F?oYb;=GqsE$dY5^BRNhUSv-g@)cB2q z=*N^=LXACG$3AS}FdkzP&r$Zg#x&mJ5I*2KzM!pCQ~B}#jRTYo@;HNQSiumdu!FMD zVpV_}DDNNQB%b0XP2ORN`qxov084Z^k7ew~6HMS4rZ`_+@J^kx7HWc|glkI>G*<*ZL=b~?s3n(hC^vEFA7~09 zY-^0Dt%j&*h?a(eD5|Nc?|D5uc;4q-;huZWec!=rz4D~H8j2VoL*y+vOx83WgvX&& z6usDmDNN%6w&5;%aUTQNKp!4rKb~L^udo{*aS311rBp?wod1P0CSp07V4*GZ)S diff --git a/onebuttoninstaller/locale-obi/ro/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-obi/ro/LC_MESSAGES/nas4free.mo index 8d85c2323578c107403e1a8feb7600d894e51897..4fd422ed8e3f345eff478c19502ba89e7ef6eeb4 100644 GIT binary patch delta 561 zcmXZZJ4?e*6u|L&+eA%#x3Pox2py~<(jbJ!I`|km2!c9@yHqV?ir^qhom>PF#6hH= zKoB9bi?d5NC+QbZba8Rr*~kU%VGF6P zeo=1nhjQMg>KwWl;RcrR1-J1NYq-Li9K1vyA5haj30alg#v~auX#{GRlyyoBkkVK} z8cQ)5RD$Is!B$nS`@J9Op_ntdx%>^X5w#ZWA2m+u?m;7rolHl^1;f>Lu;4AZUZv_U W-maQcR{9uJz4*|)$;RWBqyGW8O)~rd delta 634 zcmX}pKS%;`6u|M{Wt!JtQ!5CmGpLM^%o4$dASxmVYKw+Q=mJ3$Jcl-igrFRRaBFrH z!loK4XbqyEp(Pp`qMB;#`%de@^Yi=N`Fr>7-JP%IFFbo&D~cE(1LQq9OqMi$2zQH8 z5!A5@6F7$}=)xlEc#IybU^`Z^AJ4ECZ?PMna2?;URjGnXI2wiLQ3|Z#ByOXLM;OFU z4561(QeY0pv4nE&9HsFa{G$0+Twwo5m(uuPn^JKMp&NH>3reL}__>g4-Z;cQ_GR>8 z6=gCPxQUNQZ55%4yipA0|BE<*TbRQlj^H;=;UHt$z*StvQ}pwE^}-^CKPXd|qVfO< zX9IiG(hRl!qlXo}*yHv#uSz2f$_~oeqwhrd6cQaIleZ@#pInzWm+;izwGS;|?&r;n zmC9y}lx3tcRz8_do4c%xQLFyo7}MJ0;pmJJi6^4dCoboZ{hc|vl-T2?L#T?0!619K}=qsiM@<)B;(D+A-r_gP=E0RY>w3l#tW delta 38 ncmX>hc|vl-T2?M|T_a-!19K}Q!^zuO<=|Wsqs{kOU$OxJ+M^2z diff --git a/onebuttoninstaller/onebuttoninstaller-install.php b/onebuttoninstaller/onebuttoninstaller-install.php index f61ed59..a4f1c37 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"; // extension version +$v = "v0.2"; // extension version $appname = "OneButtonInstaller"; require_once("config.inc"); diff --git a/onebuttoninstaller/onebuttoninstaller-start.php b/onebuttoninstaller/onebuttoninstaller-start.php index 2ae4270..d80c575 100644 --- a/onebuttoninstaller/onebuttoninstaller-start.php +++ b/onebuttoninstaller/onebuttoninstaller-start.php @@ -31,8 +31,8 @@ */ $extension_dir = "/usr/local/www"; -if ( !is_link ( "/usr/local/share/locale-obi")) { mwexec("ln -s {$config['onebuttoninstaller']['rootfolder']}locale-obi /usr/local/share/", true); } // create link to languages +mwexec("ln -sf {$config['onebuttoninstaller']['rootfolder']}locale-obi /usr/local/share/", true); // create link to languages $return_val = mwexec("cp -R {$config['onebuttoninstaller']['rootfolder']}ext/* {$extension_dir}/", true); if ($return_val == 0) exec("logger onebuttoninstaller: started"); -else exec("logger onebuttoninstaller: error during startup, not started"); +else exec("logger onebuttoninstaller: error during startup, file copy to {$extension_dir} failed"); ?> diff --git a/onebuttoninstaller/release_notes.txt b/onebuttoninstaller/release_notes.txt index 4741029..f2706f6 100644 --- a/onebuttoninstaller/release_notes.txt +++ b/onebuttoninstaller/release_notes.txt @@ -1,4 +1,7 @@ Version Date Description +0.2 2016.08.09 N: configuration - enable/disable beta releases in extensions list + N: check hardware platform to use midnightcommander on i386 too + F: disabling extension not possible, leads to an error message 0.1 2016.08.01 initial release N: ... new feature diff --git a/onebuttoninstaller/version.txt b/onebuttoninstaller/version.txt index 49d5957..3b04cfb 100644 --- a/onebuttoninstaller/version.txt +++ b/onebuttoninstaller/version.txt @@ -1 +1 @@ -0.1 +0.2