diff --git a/apps/ttyd/bin/ttyd_linux_aarch64 b/apps/ttyd/bin/ttyd_linux_aarch64 new file mode 100644 index 0000000..456cb0c Binary files /dev/null and b/apps/ttyd/bin/ttyd_linux_aarch64 differ diff --git a/apps/ttyd/config/ttyd.uci b/apps/ttyd/config/ttyd.uci index 57422f8..8a2072a 100644 --- a/apps/ttyd/config/ttyd.uci +++ b/apps/ttyd/config/ttyd.uci @@ -2,6 +2,6 @@ service="ttyd" appname="ttyd" needver="0.0.1" supports="linux_arm,linux_mips,linux_x86_64" -appinfo="网页ssh工具,可在网页上 执行 shell" +appinfo="网页ssh工具,可在网页上执行 shell" newinfo="" -version="1.6.0" +version="0.0.1" diff --git a/apps/ttyd/scripts/config.sh b/apps/ttyd/scripts/config.sh index 55ae637..a2ac2d5 100644 --- a/apps/ttyd/scripts/config.sh +++ b/apps/ttyd/scripts/config.sh @@ -1,14 +1,14 @@ #!/bin/sh #copyright by monlor -eval `mbdb export npc` +eval `mbdb export ttyd` source "$(mbdb get mixbox.main.path)"/bin/base echo "********* $service ***********" echo "[${appinfo}]" readsh "启动${appname}服务[1/0] " "enable" "1" if [ "$enable" == '1' ]; then # Scripts Here - readsh "请输入${appname}端口号" "port" "6000" + readsh "请输入${appname}端口号" "port" "7681" readsh "请输入${appname}外网访问配置[1/0]" "openport" "0" readsh "重启${appname}服务[1/0] " "res" "1" [ "$res" = '1' -o -z "$res" ] && return 0 diff --git a/apps/ttyd/scripts/ttyd.sh b/apps/ttyd/scripts/ttyd.sh index 3881f5f..510d2bb 100644 --- a/apps/ttyd/scripts/ttyd.sh +++ b/apps/ttyd/scripts/ttyd.sh @@ -1,8 +1,8 @@ #!/bin/sh source /etc/mixbox/bin/base -eval `mbdb export webshell` +eval `mbdb export ttyd` -port=${port:-6000} +port=${port:-7681} start () { @@ -31,14 +31,13 @@ stop () { status() { - - if [ -n "$(pidof ${mbroot}/apps/${appname}/bin/${appname})" ]; then - status="未运行|0" - else + if pgrep -x "${mbroot}/apps/${appname}/bin/${appname}" >/dev/null; then status="运行端口号: ${port}|1" + else + status="未运行|0" fi - mbdb set $appname.main.status="$status" + mbdb set $appname.main.status="$status" } case "$1" in @@ -48,5 +47,3 @@ case "$1" in reload) close_port && open_port ;; status) status ;; esac - -