OpenWrt/small-package
1
0
Fork 0
mirror of https://github.com/kenzok8/small-package synced 2025-11-18 01:01:34 +08:00
Code Issues Projects Releases Wiki Activity

update-10.31

Browse Source
This commit is contained in:
github-actions[bot]
2021-10-31 09:03:02 +08:00
parent eee9559674
commit 96444b8f9c
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
my-default-settings/files/packages.init → luci-app-gpsysupgrade/root/etc/init.d/packages
View File

@@ -33,7 +33,7 @@ fi
while :; do
opkg update | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1
if [ "$?" == "0" ]; then
def="$(opkg list-upgradable | cut -f 1 -d ' ' | grep -vE 'opkg|luci-lib-fs|firewall|base-files|luci-base|busybox|nginx-|dnsmasq-full|coremark|miniupnpd|luci-mod-network|luci-mod-status|luci-mod-system')"
def="$(opkg list-upgradable | cut -f 1 -d ' ' | grep -vE 'opkg|luci-lib-fs|firewall|base-files|luci-base|busybox|^?nginx($|-)|dnsmasq-full|coremark|miniupnpd|luci-mod-network|luci-mod-status|luci-mod-system')"
if [ ! -f /etc/inited ]; then
insed="$(cat $BKOPKG/user_installed.opkg)"
fi
@@ -41,9 +41,9 @@ fi
if [ "$upopkg" != " " ]; then
for ipk in $upopkg; do
while :; do
opkg install --force-overwrite --force-checksum --force-depends $ipk | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 >/dev/null 2>&1 || true
opkg install --force-overwrite --force-checksum --force-depends $ipk 2>&1 | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 || true
if [[ $ipk == luci-app-* ]]; then
opkg install --force-overwrite --force-checksum luci-i18n-"$(echo $ipk | cut -d - -f 3-4)"-zh-cn | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 >/dev/null 2>&1 || true
opkg install --force-overwrite --force-checksum luci-i18n-"$(echo $ipk | cut -d - -f 3-4)"-zh-cn 2>&1 | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 || true
fi
[[ "$(opkg list-installed | grep $ipk)" ]] && {
break
@@ -61,7 +61,7 @@ fi
fi
[[ -f $BKOPKG/failed.txt && -f /etc/inited ]] && {
for ipk in $(cat $BKOPKG/failed.txt); do
opkg install --force-overwrite --force-checksum --force-depends $ipk | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 >/dev/null 2>&1 || true
opkg install --force-overwrite --force-checksum --force-depends $ipk 2>&1 | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 || true
[[ "$(opkg list-installed | grep $ipk)" ]] && {
sed -i '/$ipk/d' $BKOPKG/failed.txt
}

1
luci-app-gpsysupgrade/root/etc/uci-defaults/luci-gpsysupgrade
View File

@@ -1 +1,2 @@
chmod +x /etc/init.d/packages >/dev/null 2>&1
rm -rf /tmp/luci-modulecache /tmp/luci-indexcache*

2
luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm
View File

@@ -55,7 +55,7 @@
thread()
}
})
function cbi_row_drop(fromId, toId, store, isToBottom) {
var fromNode = document.getElementById(fromId);
var toNode = document.getElementById(toId);

5
luci-app-ssr-plus/root/etc/init.d/shadowsocksr
View File

@@ -326,7 +326,7 @@ gen_config_file() { #server1 type2 code3 local_port4 socks_port5 threads5
lua /usr/share/shadowsocksr/gen_config.lua $1 redir $4 $5 >$config_file
;;
3)
lua /usr/share/shadowsocksr/gen_config.lua $1 redir $4 $5 >$config_file
lua /usr/share/shadowsocksr/gen_config.lua $1 redir $4 >$config_file
lua /usr/share/shadowsocksr/gen_config.lua $1 socks $tmp_port >$shunt_dns_config_file
;;
4)
@@ -564,7 +564,8 @@ Start_Run() {
echolog "Main node:$($(first_type $type) --version 2>&1 | head -1) , $threads Threads Started!"
;;
naiveproxy)
gen_config_file $GLOBAL_SERVER $type 1 $tcp_port
[ "$(uci_get_by_type global threads 0)" == "0" ] && threads=1
gen_config_file $GLOBAL_SERVER $type 1 $tcp_port $threads
ln_start_bin $(first_type naive) naive $tcp_config_file
echolog "Main node:$($(first_type naive) --version 2>&1 | head -1) , $threads Threads Started!"
;;

2
luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
View File

@@ -221,7 +221,7 @@ local trojan = {
local naiveproxy = {
proxy = (server.username and server.password and server.server and server.server_port) and "https://" .. server.username .. ":" .. server.password .. "@" .. server.server .. ":" .. server.server_port,
listen = (proto == "redir") and "redir" .. "://0.0.0.0:" .. tonumber(local_port) or "socks" .. "://0.0.0.0:" .. tonumber(local_port),
concurrency = (socks_port ~= "0") and tonumber(socks_port) or "1"
["insecure-concurrency"] = (socks_port ~= "0") and tonumber(socks_port) or "1"
}
local ss = {
server = (server.kcp_enable == "1") and "127.0.0.1" or server.server,

1
my-default-settings/Makefile
View File

@@ -38,7 +38,6 @@ define Package/$(PKG_NAME)/install
$(INSTALL_DATA) ./files/wifi-init.sh $(1)/lib/wifi/wifi-init.sh
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/wifi-init.init $(1)/etc/init.d/wifi-init
$(INSTALL_BIN) ./files/packages.init $(1)/etc/init.d/packages
$(INSTALL_DIR) $(1)/etc/profile.d
$(INSTALL_BIN) ./files/sysinfo.sh $(1)/etc/profile.d/sysinfo.sh
$(INSTALL_DIR) $(1)/sbin