From b620e047a27a1340ed271973469d5e4e458bb082 Mon Sep 17 00:00:00 2001 From: crestAT Date: Fri, 25 Nov 2016 08:31:08 +0100 Subject: [PATCH] Development (#2) * v0.3.4 * v0.3.4 * v0.3.4 * v0.3.4 * v0.3.4 * v0.3.4 --- .../ext/onebuttoninstaller/fail2ban.postinit | 71 ++++++++++++-- .../onebuttoninstaller/mcommander.postinit | 76 +++++++++++++-- .../ext/ext/onebuttoninstaller/mcommander.sh | 5 + .../ext/ext/onebuttoninstaller/spinner.inc | 2 +- .../ext/onebuttoninstaller-config.php | 2 +- .../onebuttoninstaller-update_extension.php | 29 ++++-- onebuttoninstaller/ext/onebuttoninstaller.php | 31 ++++-- onebuttoninstaller/extensions.txt | 2 +- .../locale-obi/de/LC_MESSAGES/nas4free.mo | Bin 8792 -> 8792 bytes .../locale-obi/el/LC_MESSAGES/nas4free.mo | Bin 11309 -> 11309 bytes .../locale-obi/es/LC_MESSAGES/nas4free.mo | Bin 8457 -> 8473 bytes .../locale-obi/fr/LC_MESSAGES/nas4free.mo | Bin 8673 -> 8673 bytes .../locale-obi/it/LC_MESSAGES/nas4free.mo | Bin 2332 -> 5338 bytes .../locale-obi/nl/LC_MESSAGES/nas4free.mo | Bin 2972 -> 8355 bytes .../locale-obi/ro/LC_MESSAGES/nas4free.mo | Bin 2523 -> 4294 bytes .../locale-obi/ru/LC_MESSAGES/nas4free.mo | Bin 10766 -> 10766 bytes .../locale-obi/sv/LC_MESSAGES/nas4free.mo | Bin 8172 -> 8172 bytes .../locale-obi/tr/LC_MESSAGES/nas4free.mo | Bin 8111 -> 8111 bytes .../locale-obi/uk/LC_MESSAGES/nas4free.mo | Bin 10478 -> 10495 bytes .../locale-obi/zh_CN/LC_MESSAGES/nas4free.mo | Bin 0 -> 7513 bytes .../onebuttoninstaller-install.php | 92 +++++++++++------- .../onebuttoninstaller-start.php | 4 +- .../onebuttoninstaller-stop.php | 6 +- .../onebuttoninstaller_start.php | 5 - .../onebuttoninstaller_stop.php | 5 - onebuttoninstaller/release_notes.txt | 9 ++ onebuttoninstaller/version.txt | 2 +- 27 files changed, 258 insertions(+), 83 deletions(-) create mode 100644 onebuttoninstaller/locale-obi/zh_CN/LC_MESSAGES/nas4free.mo delete mode 100644 onebuttoninstaller/onebuttoninstaller_start.php delete mode 100644 onebuttoninstaller/onebuttoninstaller_stop.php diff --git a/onebuttoninstaller/ext/ext/onebuttoninstaller/fail2ban.postinit b/onebuttoninstaller/ext/ext/onebuttoninstaller/fail2ban.postinit index 3facf76..2342955 100644 --- a/onebuttoninstaller/ext/ext/onebuttoninstaller/fail2ban.postinit +++ b/onebuttoninstaller/ext/ext/onebuttoninstaller/fail2ban.postinit @@ -1,12 +1,71 @@ = 11.0) { // new rc format + // postinit command + $rc_param = []; + $rc_param['uuid'] = uuid(); + $rc_param['name'] = "Fail2Ban Extension"; + $rc_param['value'] = "{$cmd}"; + $rc_param['comment'] = "Start Fail2Ban"; + $rc_param['typeid'] = '2'; + $rc_param['enable'] = true; + $config['rc']['param'][] = $rc_param; +} +else { + $config['rc']['postinit']['cmd'][] = "{$cmd}"; +} +write_config(); ?> diff --git a/onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.postinit b/onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.postinit index b028938..004d608 100644 --- a/onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.postinit +++ b/onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.postinit @@ -1,12 +1,72 @@ = 11.0) { // new rc format + // postinit command + $rc_param = []; + $rc_param['uuid'] = uuid(); + $rc_param['name'] = "MidnightCommander Extension"; + $rc_param['value'] = "{$cmd}"; + $rc_param['comment'] = "Start MidnightCommander"; + $rc_param['typeid'] = '2'; + $rc_param['enable'] = true; + $config['rc']['param'][] = $rc_param; +} +else { + $config['rc']['postinit']['cmd'][] = "{$cmd}"; +} +write_config(); ?> diff --git a/onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.sh b/onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.sh index bbda062..f5fac9d 100644 --- a/onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.sh +++ b/onebuttoninstaller/ext/ext/onebuttoninstaller/mcommander.sh @@ -11,6 +11,8 @@ # 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 +# date: 2016-11-21 ; create symlinks for v11.x compatibility - author: crest +# # purpose: Install Midnight Commander on NAS4Free (embedded version). # Note: Check the end of the page. # @@ -82,6 +84,9 @@ cd /usr/local/lib [ -e libpcre.so.3 ] || ln -s /usr/local/lib/libpcre.so.1 libpcre.so.3 [ -e libintl.so.9 ] || ln -s /usr/local/lib/libintl.so.8 libintl.so.9 [ -e libiconv.so.3 ] || ln -s /usr/local/lib/libiconv.so.2 libiconv.so.3 +# Symlinks for v11.x +if [ -e /usr/lib/libssl.so.8 ]; then ln -sf /usr/lib/libssl.so.8 libssl.so.6; fi +if [ -e /lib/libcrypto.so.8 ]; then ln -sf /lib/libcrypto.so.8 libcrypto.so.6; fi cd - # Aliases diff --git a/onebuttoninstaller/ext/ext/onebuttoninstaller/spinner.inc b/onebuttoninstaller/ext/ext/onebuttoninstaller/spinner.inc index 6c0fd8b..7075c59 100644 --- a/onebuttoninstaller/ext/ext/onebuttoninstaller/spinner.inc +++ b/onebuttoninstaller/ext/ext/onebuttoninstaller/spinner.inc @@ -1,7 +1,7 @@