From 60baf391ca81cf674daf897caf1a77d73ebae114 Mon Sep 17 00:00:00 2001 From: Shuanglei Tao Date: Wed, 28 Sep 2016 00:46:21 +0800 Subject: [PATCH] [ci skip] openwrt: bump to 1.0.0 --- openwrt/Makefile | 18 ++++++++++-------- openwrt/files/ttyd.init | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 openwrt/files/ttyd.init diff --git a/openwrt/Makefile b/openwrt/Makefile index 4076188..7bf743e 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2015 OpenWrt.org +# Copyright (C) 2016 Shuanglei Tao # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,17 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ttyd -PKG_VERSION:=master +PKG_VERSION:=1.0.0 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/tsl0922/ttyd.git PKG_SOURCE_VERSION:=$(PKG_VERSION) -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR) - PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE @@ -30,19 +28,23 @@ include $(INCLUDE_DIR)/cmake.mk define Package/ttyd SECTION:=utils CATEGORY:=Utilities - TITLE:=A command line tool for sharing terminal over the web + TITLE:=Command-line tool for sharing terminal over the web DEPENDS:=+openssl +libjson-c +libpthread +libwebsockets-openssl URL:=https://github.com/tsl0922/ttyd + SUBMENU:=Terminal MAINTAINER:=Shuanglei Tao endef define Package/ttyd/description -ttyd is a simple command line tool for sharing terminal over the web. +ttyd is a command-line tool for sharing terminal over the web. endef define Package/ttyd/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ttyd $(1)/usr/bin/ + + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/ttyd.init $(1)/etc/init.d/ttyd endef -$(eval $(call BuildPackage,ttyd)) \ No newline at end of file +$(eval $(call BuildPackage,ttyd)) diff --git a/openwrt/files/ttyd.init b/openwrt/files/ttyd.init new file mode 100644 index 0000000..d8d6d10 --- /dev/null +++ b/openwrt/files/ttyd.init @@ -0,0 +1,26 @@ +#!/bin/sh /etc/rc.common + +START=99 +SERVICE_WRITE_PID=1 +SERVICE_DAEMONIZE=1 + +start() { + logger -t TTYD 'Starting ttyd service' + service_start /usr/bin/ttyd login + return 0 +} + +stop() { + if [ -n "`pidof ttyd`" ]; then + logger -t TTYD 'Shutting down ttyd service' + service_stop /usr/bin/ttyd + fi + return 0 +} + +restart() { + logger -t TTYD 'Restarting ttyd service' + stop + sleep 2 # give time to shutdown + start +} -- 2.43.4