update command line page to new name and default to port 4200

This commit is contained in:
Derek Macias 2016-01-06 10:00:10 -07:00
parent ce70f80119
commit 75d1d8741e
3 changed files with 19 additions and 16 deletions

View File

@ -3,12 +3,11 @@
<!DOCTYPE PLUGIN [ <!DOCTYPE PLUGIN [
<!ENTITY name "shellinabox-plugin"> <!ENTITY name "shellinabox-plugin">
<!ENTITY author "dmacias72"> <!ENTITY author "dmacias72">
<!ENTITY version "2015.12.30"> <!ENTITY version "2016.01.06">
<!ENTITY launch "Settings/Shellinabox"> <!ENTITY launch "Settings/Shellinabox">
<!ENTITY gitURL "https://raw.githubusercontent.com/&author;/unRAID-plugins/master"> <!ENTITY gitURL "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
<!ENTITY pluginURL "&gitURL;/plugins/&name;.plg"> <!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
<!ENTITY pkgURL "&gitURL;/source/packages"> <!ENTITY pkgURL "&gitURL;/source/packages">
<!ENTITY pkgs "/boot/config/plugins/&name;">
<!ENTITY plgpath "/boot/config/plugins/&name;"> <!ENTITY plgpath "/boot/config/plugins/&name;">
<!ENTITY plgname "&name;-&version;-x86_64-1"> <!ENTITY plgname "&name;-&version;-x86_64-1">
<!ENTITY emhttp "/usr/local/emhttp/plugins/&name;"> <!ENTITY emhttp "/usr/local/emhttp/plugins/&name;">
@ -21,6 +20,9 @@ This Plugin installs and controls shellinabox for unRaid 6.1 All dependencies a
--> -->
<CHANGES> <CHANGES>
###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 ###2015.12.30
- remove old plugin directory on install - remove old plugin directory on install
###2015.12.21 ###2015.12.21
@ -51,11 +53,11 @@ This Plugin installs and controls shellinabox for unRaid 6.1 All dependencies a
</CHANGES> </CHANGES>
<FILE Name="&pkgs;/shellinabox-2.19-x86_64-1sl.txz" Run="upgradepkg --install-new"> <FILE Name="&plgpath;/shellinabox-2.19-x86_64-1sl.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;/shellinabox-2.19-x86_64-1sl.txz</URL> <URL>&pkgURL;/shellinabox-2.19-x86_64-1sl.txz</URL>
<MD5>96f21406d18181f469e732795d2965e8</MD5> <MD5>96f21406d18181f469e732795d2965e8</MD5>
</FILE> </FILE>
<FILE Name="&pkgs;/linux-pam-1.1.8-x86_64-1gds.txz" Run="upgradepkg --install-new"> <FILE Name="&plgpath;/linux-pam-1.1.8-x86_64-1gds.txz" Run="upgradepkg --install-new">
<URL>&pkgURL;/linux-pam-1.1.8-x86_64-1gds.txz</URL> <URL>&pkgURL;/linux-pam-1.1.8-x86_64-1gds.txz</URL>
<MD5>f5d4e99dc0b65f4d6b3bacf479c9c6e2</MD5> <MD5>f5d4e99dc0b65f4d6b3bacf479c9c6e2</MD5>
</FILE> </FILE>
@ -87,12 +89,6 @@ if [[ ${version:0:3} == 6.0 ]]; then
exit 1 exit 1
fi 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 # Verify and install plugin package
sum1=$(/usr/bin/md5sum &plgpath;/&plgname;.txz) sum1=$(/usr/bin/md5sum &plgpath;/&plgname;.txz)
sum2=$(/usr/bin/cat &plgpath;/&plgname;.md5) sum2=$(/usr/bin/cat &plgpath;/&plgname;.md5)
@ -102,6 +98,10 @@ if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
rm &plgpath;/&plgname;.md5 rm &plgpath;/&plgname;.md5
exit 1 exit 1
else 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 upgradepkg --install-new &plgpath;/&plgname;.txz
fi fi
@ -128,7 +128,7 @@ The 'remove' script.
removepkg &plgpath;/*.txz removepkg &plgpath;/*.txz
rm -rf &emhttp; rm -rf &emhttp;
rm -f &plgpath;/*.txz rm -f &plgpath;/*.txz
rm -f &plgpath;/&plgname;.md5 rm -f &plgpath;/*.md5
echo "" echo ""
echo "-----------------------------------------------------------" echo "-----------------------------------------------------------"
@ -154,4 +154,4 @@ rm /tmp/shellinabox-chkconf
</INLINE> </INLINE>
</FILE> </FILE>
</PLUGIN> </PLUGIN>

View File

@ -11,8 +11,11 @@ Shell In A Box implements a web server that can export arbitrary command line to
</Description> </Description>
<Support>http://lime-technology.com/forum/index.php?topic=42683.0</Support> <Support>http://lime-technology.com/forum/index.php?topic=42683.0</Support>
<Icon>https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/shellinabox-plugin.png</Icon> <Icon>https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/shellinabox-plugin.png</Icon>
<Date>2015-12-30</Date> <Date>2016-01-06</Date>
<Changes> <Changes>
###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 ###2015.12.30
- remove old plugin directory on install - remove old plugin directory on install
###2015.12.21 ###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 ###2015.09.03
- initial commit - initial commit
</Changes> </Changes>
</Containers> </Containers>

View File

@ -4,8 +4,8 @@ Type="xmenu"
--- ---
<?php <?php
$sName = "shellinaboxd"; $sName = "shellinaboxd";
$shellinabox_cfg = parse_plugin_cfg("shellinabox"); $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'] : "8088"; $shellinabox_port = (isset($shellinabox_cfg['PORT']) && is_numeric($shellinabox_cfg['PORT']) && $shellinabox_cfg['PORT'] > 0 && $shellinabox_cfg['PORT'] < 65535 ) ? $shellinabox_cfg['PORT'] : "4200";
?> ?>
<style> <style>
iframe { iframe {