fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ootoc: bump to v2.0.2

Browse Source
This commit is contained in:
CN_SZTL 2020-03-21 01:57:44 +08:00
parent b2e5d40aeb
commit 38cc237c6f
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/ctcgfw/ootoc/Makefile
View File

@ -10,13 +10,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ootoc
PKG_VERSION:=1.0.1
PKG_VERSION:=2.0.2
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ElonH/ootoc.git
PKG_MIRROR_HASH:=b97bec2b1a53df2934745d800133d114b3012e8051280228cadcc507f3f6b8a9
PKG_SOURCE_VERSION:=52ca8808598f70679023629565033ddc5ca870e8
PKG_MIRROR_HASH:=565aa99c09c70c964c16ef57b731932e9376067aa133256cad200854ea64b9d0
PKG_SOURCE_VERSION:=c100c430f9222fd3ff9af2ee26bacbb998367e76
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@ -33,7 +33,7 @@ PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
CMAKE_OPTIONS+= -DOOTOC_TEST:BOOL=OFF -DOOTOC_BUILDIN_LIBTAR:BOOL=OFF
CMAKE_OPTIONS+= -DOOTOC_TEST:BOOL=OFF
define Package/ootoc
SECTION:=base

5
package/ctcgfw/ootoc/files/ootoc.conf
View File

@ -5,9 +5,8 @@ config global 'global'
config server 'server'
option addr '127.0.0.1'
option port '21730'
option tar_url 'https://github.com/ElonH/BuildOpenWRT/releases/download/v1.1.6/latest-Packages.tar'
option aux_url 'https://github.com/ElonH/BuildOpenWRT/releases/download/v1.1.6/latest-Packages.yml'
option aux_path '/etc/ootoc/latest-Packages.yml'
option tar_url 'https://github.com/ElonH/BuildOpenWRT/releases/download/snapshot/latest-Packages.tar'
option aux_url 'https://github.com/ElonH/BuildOpenWRT/releases/download/snapshot/latest-Packages.yml'
config proxy 'proxy'
option enabled '0'

19
package/ctcgfw/ootoc/files/ootoc.init
View File

@ -17,13 +17,9 @@ _err() {
init_conf() {
config_load "ootoc"
local AUX LOG
config_get AUX server aux_path
local LOG
config_get LOG log path
# detect aux file exist
[ -d "${AUX%/*}" ] || mkdir -p "${AUX%/*}" 2>/dev/null
[ -f "$AUX" ] || touch "$AUX"
[ -d "/etc/opkg/" ] || mkdir -p "/etc/opkg/" 2>/dev/null
[ -e "/etc/opkg/distfeeds.conf" ] || touch "/etc/opkg/distfeeds.conf"
@ -53,15 +49,13 @@ init_conf() {
}
start_service() {
init_conf || return 1;
config_load "ootoc"
local ENABLED ADDR PORT TAR AUX PROXY_ENABLED PROXY_ADDR LOG
local ENABLED ADDR PORT TAR_URL PROXY_ENABLED PROXY_ADDR LOG
config_get ENABLED global enabled
config_get ADDR server addr
config_get PORT server port
config_get TAR server tar_url
config_get AUX server aux_path
config_get TAR_URL server tar_url
config_get AUX_URL server aux_url
config_get PROXY_ENABLED proxy enabled
config_get PROXY_ADDR proxy proxy_addr
@ -72,14 +66,15 @@ start_service() {
return 1
}
_info "Instance 'ootoc' enabled."
init_conf || return 1;
# _info "$PROG server --log \"$LOG\" --addr \"$ADDR\" --port \"$PORT\" --tar-url \"$TAR_URL\" --aux-url \"$AUX_URL\" --subscription \"/etc/opkg/distfeeds.conf\""
procd_open_instance
procd_set_param command $PROG server
procd_append_param command --log "$LOG"
procd_append_param command --addr "$ADDR"
procd_append_param command --port "$PORT"
procd_append_param command --url "$TAR"
procd_append_param command --aux "$AUX"
procd_append_param command -l "$LOG"
procd_append_param command --tar-url "$TAR_URL"
procd_append_param command --aux-url "$AUX_URL"
procd_append_param command --subscription "/etc/opkg/distfeeds.conf"
[[ $PROXY_ENABLED == 1 ]] && {