diff --git a/packages/addons/service/ttyd/package.mk b/packages/addons/service/ttyd/package.mk index c9477cfcc9..f1139dd3d2 100644 --- a/packages/addons/service/ttyd/package.mk +++ b/packages/addons/service/ttyd/package.mk @@ -4,7 +4,7 @@ PKG_NAME="ttyd" PKG_VERSION="1.7.4" PKG_SHA256="300d8cef4b0b32b0ec30d7bf4d3721a5d180e22607f9467a95ab7b6d9652ca9b" -PKG_REV="0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/tsl0922/ttyd" diff --git a/packages/addons/service/ttyd/source/bin/ttyd.start b/packages/addons/service/ttyd/source/bin/ttyd.start index 86282af996..b7010d7e2d 100755 --- a/packages/addons/service/ttyd/source/bin/ttyd.start +++ b/packages/addons/service/ttyd/source/bin/ttyd.start @@ -7,8 +7,6 @@ oe_setup_addon service.ttyd -chmod a+x $ADDON_DIR/bin/* - LD_LIBRARY_PATH=$ADDON_DIR/lib.private:$LD_LIBRARY_PATH if [ "$TTYD_NOLOGIN" = "true" ]; then @@ -17,4 +15,5 @@ elif [ "$TTYD_NOLOGIN" = "false" ]; then TTYD_NOLOGIN="login root" fi -exec $ADDON_DIR/bin/ttyd -O -T xterm -p ${TTYD_WEBPORT} ${TTYD_NOLOGIN} &>$ADDON_HOME/service.log +[ -f "$ADDON_HOME/service.log" ] && mv -f "$ADDON_HOME/service.log" "$ADDON_HOME/service.old.log" +exec $ADDON_DIR/bin/ttyd -W -O -T xterm -p ${TTYD_WEBPORT} ${TTYD_NOLOGIN} &>$ADDON_HOME/service.log diff --git a/packages/addons/service/ttyd/source/resources/language/English/strings.po b/packages/addons/service/ttyd/source/resources/language/resource.language.en_gb/strings.po similarity index 100% rename from packages/addons/service/ttyd/source/resources/language/English/strings.po rename to packages/addons/service/ttyd/source/resources/language/resource.language.en_gb/strings.po diff --git a/packages/addons/service/ttyd/source/resources/settings.xml b/packages/addons/service/ttyd/source/resources/settings.xml index ebfca1f73a..97e4eecf65 100644 --- a/packages/addons/service/ttyd/source/resources/settings.xml +++ b/packages/addons/service/ttyd/source/resources/settings.xml @@ -1,7 +1,21 @@ - - - - - - + + +
+ + + + 0 + 11111 + + 30001 + + + + 0 + false + + + + +
diff --git a/packages/addons/service/ttyd/source/system.d/service.ttyd.service b/packages/addons/service/ttyd/source/system.d/service.ttyd.service index 958842770d..00f2be969a 100644 --- a/packages/addons/service/ttyd/source/system.d/service.ttyd.service +++ b/packages/addons/service/ttyd/source/system.d/service.ttyd.service @@ -3,10 +3,10 @@ Description=ttyd After=graphical.target [Service] -ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.ttyd/bin/ttyd.start" -TimeoutStopSec=1 +ExecStart=/storage/.kodi/addons/service.ttyd/bin/ttyd.start +TimeoutStopSec=2 Restart=always -RestartSec=2 +RestartSec=4 StartLimitInterval=0 Type=exec