diff --git a/LICENSE.txt b/LICENSE.txt index a23e24e..254c317 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ BSD 2-Clause License -Copyright (c) 2015 - 2018 Andreas Schmidhuber +Copyright (c) 2015 - 2020 Andreas Schmidhuber All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/OBI.php b/OBI.php index a66813a..f69c863 100644 --- a/OBI.php +++ b/OBI.php @@ -2,7 +2,7 @@ /* OBI.php - Copyright (c) 2015 - 2018 Andreas Schmidhuber + Copyright (c) 2015 - 2020 Andreas Schmidhuber All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/onebuttoninstaller/apps/htop-start.php b/onebuttoninstaller/apps/htop-start.php new file mode 100644 index 0000000..735ee21 --- /dev/null +++ b/onebuttoninstaller/apps/htop-start.php @@ -0,0 +1,44 @@ + diff --git a/onebuttoninstaller/apps/htop.postinit b/onebuttoninstaller/apps/htop.postinit new file mode 100644 index 0000000..da49a16 --- /dev/null +++ b/onebuttoninstaller/apps/htop.postinit @@ -0,0 +1,70 @@ += 11.0) { // new rc format + // postinit command + $rc_param = []; + $rc_param['uuid'] = uuid(); + $rc_param['name'] = "{$appName} Extension"; + $rc_param['value'] = "php {$cmd}"; + $rc_param['comment'] = "Start {$appName}"; + $rc_param['typeid'] = '2'; + $rc_param['enable'] = true; + $config['rc']['param'][] = $rc_param; +} +else { + $config['rc']['postinit']['cmd'][] = "php {$cmd}"; +} +write_config(); +require_once($cmd); +?> diff --git a/onebuttoninstaller/apps/mc-start.php b/onebuttoninstaller/apps/mc-start.php new file mode 100644 index 0000000..24c3683 --- /dev/null +++ b/onebuttoninstaller/apps/mc-start.php @@ -0,0 +1,67 @@ + $mFValue) { + if (strpos($mFKey, "usr/local/bin") > 0) $return_val += mwexec("ln -sf '{$rootfolder}/bin/{$pkgName}{$mFKey}' '{$mFKey}'", true); +// if (strpos($mFKey, "usr/local/lib") > 0) $return_val += mwexec("ln -sf '{$rootfolder}/bin/{$pkgName}{$mFKey}' '{$mFKey}'", true); + if (strpos($mFKey, "LC_MESSAGES") > 0) { + $localeDir = dirname($mFKey); + if (!file_exists($localeDir)) $return_val += mwexec("mkdir -p '{$localeDir}'", true); + $return_val += mwexec("ln -sf '{$rootfolder}/bin/{$pkgName}{$mFKey}' '{$mFKey}'", true); + } +} + +$pkgName = "libslang2"; +$pkgFileNameNeeded = $pkgName; +$manifest = ext_load_package($pkgName, $pkgFileNameNeeded, $rootfolder); +foreach ($manifest['files'] as $mFKey => $mFValue) { + if (strpos($mFKey, "usr/local/lib/libslang.so.2") > 0) $return_val += mwexec("ln -sf '{$rootfolder}/bin/{$pkgName}{$mFKey}' '{$mFKey}'", true); +} + +$pkgName = "libssh2"; +$pkgFileNameNeeded = "^libssh2"; +$manifest = ext_load_package($pkgName, $pkgFileNameNeeded, $rootfolder); +foreach ($manifest['files'] as $mFKey => $mFValue) { + if (strpos($mFKey, "usr/local/lib/libssh2.so.1") > 0) $return_val += mwexec("ln -sf '{$rootfolder}/bin/{$pkgName}{$mFKey}' '{$mFKey}'", true); +} + +if ($return_val == 0) mwexec("logger midnightcommander-extension: started successfully"); +else mwexec("logger midnightcommander-extension: error(s) during startup, failed with return value = {$return_val}"); +echo "RETVAL = {$return_val}\n"; +?> diff --git a/onebuttoninstaller/apps/mcommander.postinit b/onebuttoninstaller/apps/mcommander.postinit index 0c3a8c5..1ab3c4c 100644 --- a/onebuttoninstaller/apps/mcommander.postinit +++ b/onebuttoninstaller/apps/mcommander.postinit @@ -2,7 +2,7 @@ /* universal postinit file for CLI extensions - Copyright (c) 2015 - 2018 Andreas Schmidhuber + Copyright (c) 2015 - 2020 Andreas Schmidhuber All rights reserved. Redistribution and use in source and binary forms, with or without @@ -29,8 +29,8 @@ require_once("config.inc"); $appName = "Midnight Commander"; -$command = "mcommander.sh"; -$cmd = dirname(__FILE__)."/".$command; +$command = "mc-start.php"; +$cmd = dirname(__FILE__)."/{$command}"; // remove start/stop commands // remove existing old rc format entries @@ -56,14 +56,15 @@ if ($release[0] >= 11.0) { // new rc format $rc_param = []; $rc_param['uuid'] = uuid(); $rc_param['name'] = "{$appName} Extension"; - $rc_param['value'] = "{$cmd}"; + $rc_param['value'] = "php {$cmd}"; $rc_param['comment'] = "Start {$appName}"; $rc_param['typeid'] = '2'; $rc_param['enable'] = true; $config['rc']['param'][] = $rc_param; } else { - $config['rc']['postinit']['cmd'][] = "{$cmd}"; + $config['rc']['postinit']['cmd'][] = "php {$cmd}"; } write_config(); +require_once($cmd); ?> diff --git a/onebuttoninstaller/apps/ncdu-start.php b/onebuttoninstaller/apps/ncdu-start.php new file mode 100644 index 0000000..7cec67c --- /dev/null +++ b/onebuttoninstaller/apps/ncdu-start.php @@ -0,0 +1,42 @@ + diff --git a/onebuttoninstaller/apps/ncdu.postinit b/onebuttoninstaller/apps/ncdu.postinit index 17c8be0..bb081d5 100644 --- a/onebuttoninstaller/apps/ncdu.postinit +++ b/onebuttoninstaller/apps/ncdu.postinit @@ -2,7 +2,7 @@ /* universal postinit file for CLI extensions - Copyright (c) 2015 - 2018 Andreas Schmidhuber + Copyright (c) 2015 - 2020 Andreas Schmidhuber All rights reserved. Redistribution and use in source and binary forms, with or without @@ -29,8 +29,8 @@ require_once("config.inc"); $appName = "NCurses Disk Usage"; -$command = "ncdu.sh"; -$cmd = dirname(__FILE__)."/".$command; +$command = "ncdu-start.php"; +$cmd = dirname(__FILE__)."/{$command}"; // remove start/stop commands // remove existing old rc format entries @@ -56,14 +56,15 @@ if ($release[0] >= 11.0) { // new rc format $rc_param = []; $rc_param['uuid'] = uuid(); $rc_param['name'] = "{$appName} Extension"; - $rc_param['value'] = "{$cmd}"; + $rc_param['value'] = "php {$cmd}"; $rc_param['comment'] = "Start {$appName}"; $rc_param['typeid'] = '2'; $rc_param['enable'] = true; $config['rc']['param'][] = $rc_param; } else { - $config['rc']['postinit']['cmd'][] = "{$cmd}"; + $config['rc']['postinit']['cmd'][] = "php {$cmd}"; } write_config(); +require_once($cmd); ?> diff --git a/onebuttoninstaller/apps/show-MANIFEST.php b/onebuttoninstaller/apps/show-MANIFEST.php new file mode 100644 index 0000000..ff4042c --- /dev/null +++ b/onebuttoninstaller/apps/show-MANIFEST.php @@ -0,0 +1,44 @@ + diff --git a/onebuttoninstaller/ext/extension-lib.inc b/onebuttoninstaller/ext/extension-lib.inc index 344f9c5..42802af 100644 --- a/onebuttoninstaller/ext/extension-lib.inc +++ b/onebuttoninstaller/ext/extension-lib.inc @@ -2,7 +2,7 @@ /* extension-lib.inc - Copyright (c) 2016 - 2018 Andreas Schmidhuber + Copyright (c) 2016 - 2020 Andreas Schmidhuber All rights reserved. Redistribution and use in source and binary forms, with or without @@ -26,13 +26,40 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -$extension_lib_version = "1.2"; +$extension_lib_version = "1.4"; /* Version history: + * 1.4 2019.05.14 new function ext_load_package + * 1.3 2018.12.01 function ext_load_config: removed -> $config_data = utf8_encode($config_data); reason: wrong national character encoding * 1.2 2018.08.13 function ext_check_version: append line break to the output message * 1.1 2017.02.28 save config in ext_remove_rc_commands and ext_create_rc_commands * 1.0 2017.02.27 includes changes for PHP 7.1 */ +/* function ext_load_package + * load packages and compare already installed packages for updates + * params: + * $pkgName: plain package name + * $pkgFileNameNeeded: unique string for pkg search to retrive the right package + * $rootfolder: extension root location + * return: + * package manifest array +*/ +if (!function_exists('ext_load_package')) { + function ext_load_package($pkgName, $pkgFileNameNeeded, $rootfolder) { + if (($manifest = ext_load_config("{$rootfolder}/bin/{$pkgName}/+MANIFEST")) !== false) $pkgInstalledVersion = "{$manifest['name']}-{$manifest['version']}"; // currently installed pkg + else { + $pkgNeeded = exec("pkg search {$pkgName} | awk '/{$pkgFileNameNeeded}/ {print $1}'", $execOutput, $return_val); // retrieve available packages + $pkgFile = "{$rootfolder}/bin/All/{$pkgNeeded}.txz"; // create package file name + if (!is_file($pkgFile)) exec("pkg fetch -y -o '{$rootfolder}/bin' {$pkgNeeded}", $execOutput, $return_val); // fetch necessary package + $return_val += mwexec("mkdir -p '{$rootfolder}/bin/{$pkgName}' && tar -xf '{$pkgFile}' -C '{$rootfolder}/bin/{$pkgName}'", true); // extract package + if (($manifest = ext_load_config("{$rootfolder}/bin/{$pkgName}/+MANIFEST")) !== false) $pkgInstalledVersion = "{$manifest['name']}-{$manifest['version']}"; + } + echo "Needed : ".$pkgNeeded."\n"; + echo "Installed: ".$pkgInstalledVersion."\n"; + return $manifest; + } +} + /* function ext_check_release * checks current release against a minimal neccessary release * params: @@ -182,7 +209,6 @@ if (!function_exists('ext_load_config')) { function ext_load_config($config_file, $assoc = true, $depth = 512, $options = 0) { if (is_file($config_file)) { if (($config_data = file_get_contents($config_file)) === false) return false; - $config_data = utf8_encode($config_data); $config_data = json_decode($config_data, $assoc, $depth, $options); return $config_data; } diff --git a/onebuttoninstaller/extensions.txt b/onebuttoninstaller/extensions.txt index 65036d8..d9e3d6e 100644 --- a/onebuttoninstaller/extensions.txt +++ b/onebuttoninstaller/extensions.txt @@ -4,8 +4,6 @@ BitTorrent Sync###RELEASE
0.7.x###btsync###fetch h Syncthing###RELEASE
0.2.x###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 XigmaNAS (N4F) servers.

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

Note: The current 10.3 and 11.x series of XigmaNAS contain Syncthing already out of the box so this extensions is mainly for older releases OR if one need to upgrade/rollback Syncthing versions without upgrade/downgrade the XigmaNAS firmware for compatibility reasons with other devices.

Read more ... GitHub Wiki###-### TheBrig###RELEASE
0.9x###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 XigmaNAS.

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

Read more ... XigmaNAS Forum###10.3### DNSMasq DHCP Server###RELEASE
0.4x###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 XigmaNAS.

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

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

GNU Midnight Commander is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. It's a feature rich full-screen text mode application that allows you to copy, move and delete files and whole directory trees, search for files and run commands in the subshell. Internal viewer and editor are included.

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 ... XigmaNAS Forum###rpi, rpi2, rpi3, bananapi### -NCurses Disk Usage###RELEASE
1.12###ncdu.sh###mkdir -p ncdu && cd ncdu && cp /usr/local/www/ext/onebuttoninstaller/../apps/ncdu.* . && chmod u+x ncdu.sh && `pwd`/ncdu.sh###ncdu/ncdu.postinit###NCurses Disk Usage

Ncdu is a disk usage analyzer with an ncurses interface. It is designed to find space hogs on a remote server where you don't have an entire graphical setup available, but it is a useful tool even on regular desktop systems.

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

Read more ... XigmaNAS Forum###rpi, rpi2, rpi3, bananapi### Virtual Machine BHYVE###ALPHA
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 XigmaNAS. Based on vm-bhyve.

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

Read more ... XigmaNAS Forum###x86, 10.2, rpi, rpi2, rpi3, bananapi### Plex Media Server###RELEASE
4.3.x###plexinit###mkdir -p plex && cd plex && fetch https://raw.githubusercontent.com/JRGTH/xigmanas-plex-extension/master/plex/plexinit && chmod +x plexinit && ./plexinit -o###plex/postinit###Plex Media Server Add-On for XigmaNAS 11.0 and later.

The extension works on XigmaNAS 11.0 and later versions, 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 the actual Plex configuration.

Note: Plex Pass is available at the beta channel in OneButtonInstaller - activate 'Beta releases' in Extensions > OneButtonInstaller > Configuration to get it in shown in the extensions list!
To install Plex Pass a previous standard Plex installation must be uninstalled with Extensions > Plex Media Server > Uninstall (Plexdata can stay intact - don't tick to delete the user data as well) and afterwards the Plex Pass package can be installed!

Read more ... XigmaNAS Forum###x86, 10.3, rpi, rpi2, rpi3, bananapi### Downloady###RELEASE
0.1.x###downloady###mkdir -p downloady && cd downloady && fetch 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 for http/https/ftp sites based on Downloady by CyberLeo|cyberLeo Projects.

The extension fully integrates a wget based download manager into the XigmaNAS WebGUI, works on all plattforms (x86 & x64, ARM, embedded & full), does not need jail or pkg_add, enhance pages of the XigmaNAS WebGUI and features configuration and extension maintenance (update & removal inside the WebGUI). Based on Downloady by CyberLeo it has been extended and offers restart on server reboot, bandwidth limits for downloads as well as a daily scheduler to start/stop Downloady at a specific time.

Read more ... XigmaNAS Forum @@ -19,3 +17,6 @@ PyTivo###RELEASE
0.1.x###pytivoinit###mkdir -p pyt BE Manager###RELEASE
0.2.x###beminit###mkdir -p bemanager && cd bemanager && fetch https://raw.githubusercontent.com/JRGTH/xigmanas-bem-extension/master/beminit && chmod +x beminit && ./beminit -o###bemanager/postinit###Boot Environments Manager extension for XigmaNAS.

Utility to manage Boot Environments with ZFS compliant platforms.

Note: This extension is compatible with RootOnZFS platforms only.

Read more ... XigmaNAS Forum###11.0, x86, rpi, rpi2, rpi3, bananapi### Themes###RELEASE
1.x###themes-start###mkdir -p themes && cd themes && fetch https://raw.github.com/crestAT/nas4free-themes/master/themes/themes-install.php && chmod +x themes* ###themes/themes-install.php###XigmaNAS themes extension.

The extension consists of a theme manager to choose from different as well as a simple theme designer. The themes are based on the original XigmaNAS WebGUI - the theme designer provide the means to change colors in an easy-to-use way and also to choose different device size bar types for Status > System and swap devices.

Read more ... XigmaNAS Forum###11.2, x86, rpi, rpi2, rpi3, bananapi### Bastille Manager###RELEASE
1.x###bastille-init###mkdir -p -m 0750 bastille && cd bastille && fetch --no-verify-peer https://raw.githubusercontent.com/JRGTH/xigmanas-bastille-extension/master/bastille-init && chmod +x bastille-init && ./bastille-init -o###bastille/postinit###XigmaNAS Bastille Extension

A ZERO dependency Bastille Jail/Container Manager Extension for XigmaNAS. Containers creation and management made easy!

Read more ... XigmaNAS Forum###11.2, x86, rpi, rpi2, rpi3, bananapi### +NCurses Disk Usage###RELEASE
1.x###ncdu-start.php###chmod u+x /usr/local/www/ext/onebuttoninstaller/../apps/*###onebuttoninstaller/apps/ncdu.postinit###NCurses Disk Usage CLI extension

Ncdu is a disk usage analyzer with an ncurses interface. It is designed to find space hogs on a remote server where you don't have an entire graphical setup available, but it is a useful tool even on regular desktop systems.

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

Read more ... XigmaNAS Forum###rpi, rpi2, rpi3, bananapi### +Midnight Commander###RELEASE
4.x###mc-start.php###chmod u+x /usr/local/www/ext/onebuttoninstaller/../apps/*###onebuttoninstaller/apps/mcommander.postinit###Midnight Commander CLI extension

GNU Midnight Commander is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. It's a feature rich full-screen text mode application that allows you to copy, move and delete files and whole directory trees, search for files and run commands in the subshell. Internal viewer and editor are included.

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 ... XigmaNAS Forum###rpi, rpi2, rpi3, bananapi### +Htop###RELEASE
2.x###htop-start.php###chmod u+x /usr/local/www/ext/onebuttoninstaller/../apps/*###onebuttoninstaller/apps/htop.postinit###htop CLI extension

htop is an interactive text-mode process viewer for Unix systems. It aims to be a better 'top'.

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

Read more ... Github###rpi, rpi2, rpi3, bananapi### diff --git a/onebuttoninstaller/locale-onebuttoninstaller/ca/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/ca/LC_MESSAGES/nas4free.mo index e3e7b90..eaf5ada 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/ca/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/ca/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/cs/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/cs/LC_MESSAGES/nas4free.mo index 4e9d9d4..55fdd1c 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/cs/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/cs/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/de/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/de/LC_MESSAGES/nas4free.mo index 625ee51..a98c4ad 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/de/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/de/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/el/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/el/LC_MESSAGES/nas4free.mo index 00a8593..f38597a 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/el/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/el/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/es/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/es/LC_MESSAGES/nas4free.mo index 5520888..a2b6cf2 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/es/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/es/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/fr/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/fr/LC_MESSAGES/nas4free.mo index 3a24ca4..42ee3b8 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/fr/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/fr/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/it/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/it/LC_MESSAGES/nas4free.mo index 7aa02c4..3c1e6f2 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/it/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/it/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/ku/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/ku/LC_MESSAGES/nas4free.mo index 520cb8a..b5a4dc3 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/ku/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/ku/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/nl/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/nl/LC_MESSAGES/nas4free.mo index b20c139..82c88d5 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/nl/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/nl/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/pt/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/pt/LC_MESSAGES/nas4free.mo index 088e1ae..76cd97d 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/pt/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/pt/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/ro/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/ro/LC_MESSAGES/nas4free.mo index 71f7bd4..57a3998 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/ro/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/ro/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/ru/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/ru/LC_MESSAGES/nas4free.mo index 7a32c4d..7b9dbd7 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/ru/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/ru/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/sl/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/sl/LC_MESSAGES/nas4free.mo index 85147d0..c6e1347 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/sl/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/sl/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/sv/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/sv/LC_MESSAGES/nas4free.mo index 9d618c9..c299a8e 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/sv/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/sv/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/tr/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/tr/LC_MESSAGES/nas4free.mo index 6c46ec2..6c9748c 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/tr/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/tr/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/uk/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/uk/LC_MESSAGES/nas4free.mo index 62d6f29..9269759 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/uk/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/uk/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/locale-onebuttoninstaller/zh_CN/LC_MESSAGES/nas4free.mo b/onebuttoninstaller/locale-onebuttoninstaller/zh_CN/LC_MESSAGES/nas4free.mo index 8eac01c..1b53cdc 100644 Binary files a/onebuttoninstaller/locale-onebuttoninstaller/zh_CN/LC_MESSAGES/nas4free.mo and b/onebuttoninstaller/locale-onebuttoninstaller/zh_CN/LC_MESSAGES/nas4free.mo differ diff --git a/onebuttoninstaller/onebuttoninstaller-config.php b/onebuttoninstaller/onebuttoninstaller-config.php index 1a9da76..3b1d6f7 100644 --- a/onebuttoninstaller/onebuttoninstaller-config.php +++ b/onebuttoninstaller/onebuttoninstaller-config.php @@ -2,7 +2,7 @@ /* onebuttoninstaller-config.php - Copyright (c) 2015 - 2018 Andreas Schmidhuber + Copyright (c) 2015 - 2020 Andreas Schmidhuber All rights reserved. Redistribution and use in source and binary forms, with or without @@ -138,7 +138,7 @@ function enable_change(enable_change) { } //--> -
+
    diff --git a/onebuttoninstaller/onebuttoninstaller-install.php b/onebuttoninstaller/onebuttoninstaller-install.php index c6eb6e5..62836f9 100644 --- a/onebuttoninstaller/onebuttoninstaller-install.php +++ b/onebuttoninstaller/onebuttoninstaller-install.php @@ -2,7 +2,7 @@ /* onebuttoninstaller-install.php - Copyright (c) 2015 - 2018 Andreas Schmidhuber + Copyright (c) 2015 - 2020 Andreas Schmidhuber All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -$v = "v0.4.0.2"; // extension version +$v = "v0.4.1"; // extension version $appName = "OneButtonInstaller"; $configName = "onebuttoninstaller"; diff --git a/onebuttoninstaller/onebuttoninstaller-start.php b/onebuttoninstaller/onebuttoninstaller-start.php index 7b54f66..75661d8 100644 --- a/onebuttoninstaller/onebuttoninstaller-start.php +++ b/onebuttoninstaller/onebuttoninstaller-start.php @@ -2,7 +2,7 @@ /* onebuttoninstaller-start.php - Copyright (c) 2015 - 2018 Andreas Schmidhuber + Copyright (c) 2015 - 2020 Andreas Schmidhuber All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/onebuttoninstaller/onebuttoninstaller-stop.php b/onebuttoninstaller/onebuttoninstaller-stop.php index 7264141..de33533 100644 --- a/onebuttoninstaller/onebuttoninstaller-stop.php +++ b/onebuttoninstaller/onebuttoninstaller-stop.php @@ -2,7 +2,7 @@ /* onebuttoninstaller-stop.php - Copyright (c) 2015 - 2018 Andreas Schmidhuber + Copyright (c) 2015 - 2020 Andreas Schmidhuber All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/onebuttoninstaller/onebuttoninstaller-update_extension.php b/onebuttoninstaller/onebuttoninstaller-update_extension.php index fe4ebde..eac4784 100644 --- a/onebuttoninstaller/onebuttoninstaller-update_extension.php +++ b/onebuttoninstaller/onebuttoninstaller-update_extension.php @@ -2,7 +2,7 @@ /* onebuttoninstaller-update_extension.php - Copyright (c) 2015 - 2018 Andreas Schmidhuber + Copyright (c) 2015 - 2020 Andreas Schmidhuber All rights reserved. Redistribution and use in source and binary forms, with or without @@ -74,12 +74,7 @@ bindtextdomain($domain, $localeOSDirectory); include("fbegin.inc"); bindtextdomain($domain, $localeExtDirectory); ?> - - - - - - + diff --git a/onebuttoninstaller/onebuttoninstaller.php b/onebuttoninstaller/onebuttoninstaller.php index 4527cad..d96834c 100644 --- a/onebuttoninstaller/onebuttoninstaller.php +++ b/onebuttoninstaller/onebuttoninstaller.php @@ -2,7 +2,7 @@ /* onebuttoninstaller.php - Copyright (c) 2015 - 2018 Andreas Schmidhuber + Copyright (c) 2015 - 2020 Andreas Schmidhuber All rights reserved. Redistribution and use in source and binary forms, with or without @@ -263,12 +263,7 @@ bindtextdomain($domain, $localeOSDirectory); include("fbegin.inc"); bindtextdomain($domain, $localeExtDirectory); ?> - - - - - - +
      @@ -112,7 +107,7 @@ bindtextdomain($domain, $localeExtDirectory);
    - +
      diff --git a/onebuttoninstaller/release_notes.txt b/onebuttoninstaller/release_notes.txt index 72853d0..e4d123a 100644 --- a/onebuttoninstaller/release_notes.txt +++ b/onebuttoninstaller/release_notes.txt @@ -1,4 +1,13 @@ Version Date Description +0.4.1 2020.06.01 N: Htop CLI extension + C: MidnightCommander & NCDU - improved startup with checks/updates for new releases & changed XigmaNAS firmware + C: update Czech translation + C: update Spanish translation + C: update French translation + C: update Ukrainian translation + C: update Chinese translation + C: update Turkish translation + 0.4.0.2 2018.10.18 F: installation errors on multiple installations in some cases C: update Russian translation C: update Ukrainian translation diff --git a/onebuttoninstaller/version.txt b/onebuttoninstaller/version.txt index 4a6c13e..44bb5d1 100644 --- a/onebuttoninstaller/version.txt +++ b/onebuttoninstaller/version.txt @@ -1 +1 @@ -0.4.0.2 \ No newline at end of file +0.4.1 \ No newline at end of file