diff --git a/plugins/shellinabox-plugin.plg b/plugins/shellinabox-plugin.plg index 8f4eb883..1d0471e4 100755 --- a/plugins/shellinabox-plugin.plg +++ b/plugins/shellinabox-plugin.plg @@ -3,12 +3,11 @@ - + - @@ -21,6 +20,9 @@ This Plugin installs and controls shellinabox for unRaid 6.1 All dependencies a --> +###2016.01.06 +- change package path to plugin directory +- fix Tool/Command Line page misspelled cfg file and defaulting to port 8088 instead of 4200 ###2015.12.30 - remove old plugin directory on install ###2015.12.21 @@ -51,11 +53,11 @@ This Plugin installs and controls shellinabox for unRaid 6.1 All dependencies a - + &pkgURL;/shellinabox-2.19-x86_64-1sl.txz 96f21406d18181f469e732795d2965e8 - + &pkgURL;/linux-pam-1.1.8-x86_64-1gds.txz f5d4e99dc0b65f4d6b3bacf479c9c6e2 @@ -87,12 +89,6 @@ if [[ ${version:0:3} == 6.0 ]]; then exit 1 fi -#remove old plugin name directory -if [ -d /usr/local/emhttp/plugins/shellinabox ]; then - rm -rf /usr/local/emhttp/plugins/shellinabox -fi - - # Verify and install plugin package sum1=$(/usr/bin/md5sum &plgpath;/&plgname;.txz) sum2=$(/usr/bin/cat &plgpath;/&plgname;.md5) @@ -102,6 +98,10 @@ if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then rm &plgpath;/&plgname;.md5 exit 1 else + #remove old plugin name directory + if [ -d /usr/local/emhttp/plugins/shellinabox ]; then + rm -rf /usr/local/emhttp/plugins/shellinabox + fi upgradepkg --install-new &plgpath;/&plgname;.txz fi @@ -128,7 +128,7 @@ The 'remove' script. removepkg &plgpath;/*.txz rm -rf &emhttp; rm -f &plgpath;/*.txz -rm -f &plgpath;/&plgname;.md5 +rm -f &plgpath;/*.md5 echo "" echo "-----------------------------------------------------------" @@ -154,4 +154,4 @@ rm /tmp/shellinabox-chkconf - + \ No newline at end of file diff --git a/plugins/shellinabox-plugin.xml b/plugins/shellinabox-plugin.xml index 96fbda52..309ac97f 100644 --- a/plugins/shellinabox-plugin.xml +++ b/plugins/shellinabox-plugin.xml @@ -11,8 +11,11 @@ Shell In A Box implements a web server that can export arbitrary command line to http://lime-technology.com/forum/index.php?topic=42683.0 https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/shellinabox-plugin.png -2015-12-30 +2016-01-06 +###2016.01.06 +- change package path to plugin directory +- fix Tool/Command Line page misspelled cfg file and defaulting to port 8088 instead of 4200 ###2015.12.30 - remove old plugin directory on install ###2015.12.21 @@ -41,4 +44,4 @@ Shell In A Box implements a web server that can export arbitrary command line to ###2015.09.03 - initial commit - + \ No newline at end of file diff --git a/source/shellinabox-plugin/usr/local/emhttp/plugins/shellinabox-plugin/CommandLine.page b/source/shellinabox-plugin/usr/local/emhttp/plugins/shellinabox-plugin/CommandLine.page index f6c7a9e9..b55c958c 100644 --- a/source/shellinabox-plugin/usr/local/emhttp/plugins/shellinabox-plugin/CommandLine.page +++ b/source/shellinabox-plugin/usr/local/emhttp/plugins/shellinabox-plugin/CommandLine.page @@ -4,8 +4,8 @@ Type="xmenu" --- 0 && $shellinabox_cfg['PORT'] < 65535 ) ? $shellinabox_cfg['PORT'] : "8088"; +$shellinabox_cfg = parse_plugin_cfg("shellinabox-plugin"); +$shellinabox_port = (isset($shellinabox_cfg['PORT']) && is_numeric($shellinabox_cfg['PORT']) && $shellinabox_cfg['PORT'] > 0 && $shellinabox_cfg['PORT'] < 65535 ) ? $shellinabox_cfg['PORT'] : "4200"; ?>