OpenWrt/kenzok8-passwall
1
0
Fork 0
mirror of https://github.com/kenzok8/openwrt-packages.git synced 2025-01-07 03:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 2023-02-14 20:16:45

Browse Source
This commit is contained in:
github-actions[bot] 2023-02-14 20:16:45 +08:00
parent 5a106f32a6
commit 2dcfe8fb4f
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall2/Makefile
View File

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2
PKG_VERSION:=1.8
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \

8
luci-app-passwall2/root/usr/share/passwall2/app.sh
View File

@ -273,12 +273,12 @@ run_v2ray() {
eval_set_val $@
local type=$(echo $(config_n_get $node type) | tr 'A-Z' 'a-z')
if [ "$type" != "v2ray" ] && [ "$type" != "xray" ]; then
local bin=$(first_type $(config_t_get global_app v2ray_file) v2ray)
local bin=$(first_type $(config_t_get global_app xray_file) xray)
if [ -n "$bin" ]; then
type="v2ray"
type="xray"
else
bin=$(first_type $(config_t_get global_app xray_file) xray)
[ -n "$bin" ] && type="xray"
bin=$(first_type $(config_t_get global_app v2ray_file) v2ray)
[ -n "$bin" ] && type="v2ray"
fi
fi
[ -z "$type" ] && return 1

2
luci-app-passwall2/root/usr/share/passwall2/iptables.sh
View File

@ -236,7 +236,7 @@ load_acl() {
eval node_${node}_redir_port=$redir_port
local type=$(echo $(config_n_get $node type) | tr 'A-Z' 'a-z')
if [ -n "${type}" ] && ([ "${type}" = "v2ray" ] || [ "${type}" = "xray" ]); then
if [ -n "${type}" ]; then
config_file=$TMP_ACL_PATH/${node}_TCP_UDP_DNS_${redir_port}.json
dns_port=$(get_new_port $(expr $dns_port + 1))
local acl_socks_port=$(get_new_port $(expr $redir_port + $index))

6
luci-theme-opentopd/Makefile
View File

@ -1,5 +1,5 @@
# Copyright (C) 2008-2019 Jerrykuku
# Copyright (C) 2019-2021 sirpdboy
# Copyright (C) 2019-2023 sirpdboy
# http://www.github.com/sirpdboy/luci-theme-opentopd
# This is free software, licensed under the Apache License, Version 2.0 .
@ -9,8 +9,8 @@ THEME_NAME:=opentopd
THEME_TITLE:=opentopd Theme
PKG_NAME:=luci-theme-$(THEME_NAME)
PKG_VERSION:=1.5.0
PKG_RELEASE:=20220809
PKG_VERSION:=1.6.0
PKG_RELEASE:=20230207
include $(INCLUDE_DIR)/package.mk

2
luci-theme-opentopd/htdocs/luci-static/opentopd/css/style.css
View File

File diff suppressed because one or more lines are too long

6
luci-theme-opentopd/root/etc/uci-defaults/30_luci-theme-opentopd
View File

@ -1,9 +1,7 @@
#!/bin/sh
[ -f /www/luci-static/opentopd/icons/ethernet.png ] && mv -f /www/luci-static/opentopd/icons/ethernet.png /www/luci-static/resources/icons/ethernet.png
[ -f /www/luci-static/opentopd/icons/ethernet_disabled.png ] && mv -f /www/luci-static/opentopd/icons/ethernet_disabled.png /www/luci-static/resources/icons/ethernet_disabled.png
[ -f /www/luci-static/opentopd/icons/port_down.png ] && mv -f /www/luci-static/opentopd/icons/port_down.png /www/luci-static/resources/icons/port_down.png
[ -f /www/luci-static/opentopd/icons/port_up.png ] && mv -f /www/luci-static/opentopd/icons/port_up.png /www/luci-static/resources/icons/port_up.png
rm -Rf /var/luci-modulecache
rm -Rf /var/luci-indexcache
uci batch <<-EOF
set luci.themes.Opentopd=/luci-static/opentopd
set luci.main.mediaurlbase=/luci-static/opentopd