fix: bugfix for ttyd

This commit is contained in:
Fred Liang
2020-05-28 08:00:53 +08:00
parent 3adb437795
commit beafeeeedd
4 changed files with 10 additions and 13 deletions

Binary file not shown.

View File

@@ -2,6 +2,6 @@ service="ttyd"
appname="ttyd" appname="ttyd"
needver="0.0.1" needver="0.0.1"
supports="linux_arm,linux_mips,linux_x86_64" supports="linux_arm,linux_mips,linux_x86_64"
appinfo="网页ssh工具可在网页上 执行 shell" appinfo="网页ssh工具可在网页上执行 shell"
newinfo="" newinfo=""
version="1.6.0" version="0.0.1"

View File

@@ -1,14 +1,14 @@
#!/bin/sh #!/bin/sh
#copyright by monlor #copyright by monlor
eval `mbdb export npc` eval `mbdb export ttyd`
source "$(mbdb get mixbox.main.path)"/bin/base source "$(mbdb get mixbox.main.path)"/bin/base
echo "********* $service ***********" echo "********* $service ***********"
echo "[${appinfo}]" echo "[${appinfo}]"
readsh "启动${appname}服务[1/0] " "enable" "1" readsh "启动${appname}服务[1/0] " "enable" "1"
if [ "$enable" == '1' ]; then if [ "$enable" == '1' ]; then
# Scripts Here # Scripts Here
readsh "请输入${appname}端口号" "port" "6000" readsh "请输入${appname}端口号" "port" "7681"
readsh "请输入${appname}外网访问配置[1/0]" "openport" "0" readsh "请输入${appname}外网访问配置[1/0]" "openport" "0"
readsh "重启${appname}服务[1/0] " "res" "1" readsh "重启${appname}服务[1/0] " "res" "1"
[ "$res" = '1' -o -z "$res" ] && return 0 [ "$res" = '1' -o -z "$res" ] && return 0

View File

@@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
source /etc/mixbox/bin/base source /etc/mixbox/bin/base
eval `mbdb export webshell` eval `mbdb export ttyd`
port=${port:-6000} port=${port:-7681}
start () { start () {
@@ -31,14 +31,13 @@ stop () {
status() { status() {
if pgrep -x "${mbroot}/apps/${appname}/bin/${appname}" >/dev/null; then
if [ -n "$(pidof ${mbroot}/apps/${appname}/bin/${appname})" ]; then
status="未运行|0"
else
status="运行端口号: ${port}|1" status="运行端口号: ${port}|1"
else
status="未运行|0"
fi fi
mbdb set $appname.main.status="$status"
mbdb set $appname.main.status="$status"
} }
case "$1" in case "$1" in
@@ -48,5 +47,3 @@ case "$1" in
reload) close_port && open_port ;; reload) close_port && open_port ;;
status) status ;; status) status ;;
esac esac