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

ootoc: bump to v1.0.0

Browse Source
This commit is contained in:
CN_SZTL 2020-03-15 16:32:12 +08:00
parent 6df0af2f67
commit 8714d9e477
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 13 additions and 5342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/ctcgfw/ootoc/Makefile
View File

@ -10,13 +10,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ootoc
PKG_VERSION:=0.0.1
PKG_RELEASE:=2
PKG_VERSION:=1.0.0
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ElonH/ootoc.git
PKG_MIRROR_HASH:=8df94810a5c4ab69556531f628006f6f4f7c443a211b386ece4cde65f4e1bd50
PKG_SOURCE_VERSION:=449f254d54e854221f967c4d156f54ee1af224fb
PKG_MIRROR_HASH:=b97bec2b1a53df2934745d800133d114b3012e8051280228cadcc507f3f6b8a9
PKG_SOURCE_VERSION:=52ca8808598f70679023629565033ddc5ca870e8
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@ -60,7 +60,6 @@ define Package/ootoc/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ootocCLI $(1)/usr/bin/
$(INSTALL_BIN) ./files/ootoc.init $(1)/etc/init.d/ootoc
$(INSTALL_DATA) ./files/ootoc.conf $(1)/etc/config/ootoc
$(INSTALL_DATA) ./files/latest-Packages.yml $(1)/var/etc/ootoc/latest-Packages.yml
endef
$(eval $(call BuildPackage,ootoc))

5328
package/ctcgfw/ootoc/files/latest-Packages.yml
View File

File diff suppressed because it is too large Load Diff

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

@ -5,8 +5,9 @@ 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/1.1.0/latest-Packages.tar'
option aux_path '/var/etc/ootoc/latest-Packages.yml'
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'
config proxy 'proxy'
option enabled '0'

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

@ -23,10 +23,9 @@ init_conf() {
# detect aux file exist
[ -d "${AUX%/*}" ] || mkdir -p "${AUX%/*}" 2>/dev/null
[ -f "$AUX" ] || {
echo "auxilary file not found: ${AUX}"
return 1
}
[ -f "$AUX" ] || touch "$AUX"
[ -d "/etc/opkg/" ] || mkdir -p "/etc/opkg/" 2>/dev/null
[ -e "/etc/opkg/distfeeds.conf" ] || touch "/etc/opkg/distfeeds.conf"
# backup opkg feeds conf
FEEDS="/etc/opkg/distfeeds.conf"
@ -63,6 +62,7 @@ start_service() {
config_get PORT server port
config_get TAR server tar_url
config_get AUX server aux_path
config_get AUX_URL server aux_url
config_get PROXY_ENABLED proxy enabled
config_get PROXY_ADDR proxy proxy_addr
config_get LOG log path
@ -72,9 +72,6 @@ start_service() {
return 1
}
_info "Instance 'ootoc' enabled."
_info "$PROG subscription --addr \"$ADDR\" --port \"$PORT\" -i \"$AUX\" > \"/etc/opkg/distfeeds.conf\""
$PROG subscription --addr "$ADDR" --port "$PORT" -i "$AUX" > "/etc/opkg/distfeeds.conf"
procd_open_instance
procd_set_param command $PROG server
@ -83,6 +80,8 @@ start_service() {
procd_append_param command --url "$TAR"
procd_append_param command --aux "$AUX"
procd_append_param command -l "$LOG"
procd_append_param command --aux-url "$AUX_URL"
procd_append_param command --subscription "/etc/opkg/distfeeds.conf"
[[ $PROXY_ENABLED == 1 ]] && {
procd_set_param env all_proxy="$PROXY_ADDR" https_proxy="$PROXY_ADDR" http_proxy="$PROXY_ADDR"
procd_set_param env ALL_PROXY="$PROXY_ADDR" HTTPS_PROXY="$PROXY_ADDR" HTTP_PROXY="$PROXY_ADDR"