i11th/ruantiblock_openwrt
1
0
Fork 0
mirror of https://github.com/gSpotx2f/ruantiblock_openwrt.git synced 2026-05-13 14:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed autoinstall.

Browse Source
This commit is contained in:
gSpot
2025-12-25 03:39:34 +03:00
parent f660d8c616
commit 75724ed7c0
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoinstall/2.x/apk/autoinstall.sh
+3 -2
View File
@@ -35,7 +35,8 @@ URL_TORRC="https://raw.githubusercontent.com/gSpotx2f/ruantiblock_openwrt/master
CONFIG_DIR="${PREFIX}/etc/ruantiblock" CONFIG_DIR="${PREFIX}/etc/ruantiblock"
USER_LISTS_DIR="${CONFIG_DIR}/user_lists" USER_LISTS_DIR="${CONFIG_DIR}/user_lists"
EXEC_DIR="${PREFIX}/usr/bin" EXEC_DIR="${PREFIX}/usr/bin"
BACKUP_DIR="${CONFIG_DIR}/autoinstall.bak.$(date +%s)" BACKUP_DIR_BASE="${CONFIG_DIR}/autoinstall.bak"
BACKUP_DIR="${BACKUP_DIR_BASE}.$(date +%s)"
### packages ### packages
FILE_RUAB_PKG="${PKG_DIR}/ruantiblock-${RUAB_VERSION}.apk" FILE_RUAB_PKG="${PKG_DIR}/ruantiblock-${RUAB_VERSION}.apk"
FILE_MOD_LUA_PKG="${PKG_DIR}/ruantiblock-mod-lua-${RUAB_MOD_LUA_VERSION}.apk" FILE_MOD_LUA_PKG="${PKG_DIR}/ruantiblock-mod-lua-${RUAB_MOD_LUA_VERSION}.apk"
@@ -120,7 +121,7 @@ BackupFile() {
BackupCurrentConfig() { BackupCurrentConfig() {
local _file local _file
MakeDir "$BACKUP_DIR" MakeDir "$BACKUP_DIR"
for _file in $(ls -1 "$CONFIG_DIR" | grep -v "$(basename $BACKUP_DIR)") for _file in $(ls -1 "$CONFIG_DIR" | grep -v "$(basename $BACKUP_DIR_BASE)*")
do do
cp -af "${CONFIG_DIR}/${_file}" "${BACKUP_DIR}/${_file}" cp -af "${CONFIG_DIR}/${_file}" "${BACKUP_DIR}/${_file}"
done done
autoinstall/2.x/apk/uninstall.sh
+3 -2
View File
@@ -7,7 +7,8 @@ PREFIX=""
CONFIG_DIR="${PREFIX}/etc/ruantiblock" CONFIG_DIR="${PREFIX}/etc/ruantiblock"
USER_LISTS_DIR="${CONFIG_DIR}/user_lists" USER_LISTS_DIR="${CONFIG_DIR}/user_lists"
EXEC_DIR="${PREFIX}/usr/bin" EXEC_DIR="${PREFIX}/usr/bin"
BACKUP_DIR="${CONFIG_DIR}/autoinstall.bak.$(date +%s)" BACKUP_DIR_BASE="${CONFIG_DIR}/autoinstall.bak"
BACKUP_DIR="${BACKUP_DIR_BASE}.$(date +%s)"
HTDOCS_VIEW="${PREFIX}/www/luci-static/resources/view" HTDOCS_VIEW="${PREFIX}/www/luci-static/resources/view"
HTDOCS_RUAB="${HTDOCS_VIEW}/ruantiblock" HTDOCS_RUAB="${HTDOCS_VIEW}/ruantiblock"
CRONTAB_FILE="/etc/crontabs/root" CRONTAB_FILE="/etc/crontabs/root"
@@ -61,7 +62,7 @@ RemoveFile() {
BackupCurrentConfig() { BackupCurrentConfig() {
local _file local _file
MakeDir "$BACKUP_DIR" MakeDir "$BACKUP_DIR"
for _file in $(ls -1 "$CONFIG_DIR" | grep -v "$(basename $BACKUP_DIR)") for _file in $(ls -1 "$CONFIG_DIR" | grep -v "$(basename $BACKUP_DIR_BASE)*")
do do
cp -af "${CONFIG_DIR}/${_file}" "${BACKUP_DIR}/${_file}" cp -af "${CONFIG_DIR}/${_file}" "${BACKUP_DIR}/${_file}"
done done
autoinstall/2.x/autoinstall.sh
+3 -2
View File
@@ -35,7 +35,8 @@ URL_TORRC="https://raw.githubusercontent.com/gSpotx2f/ruantiblock_openwrt/master
CONFIG_DIR="${PREFIX}/etc/ruantiblock" CONFIG_DIR="${PREFIX}/etc/ruantiblock"
USER_LISTS_DIR="${CONFIG_DIR}/user_lists" USER_LISTS_DIR="${CONFIG_DIR}/user_lists"
EXEC_DIR="${PREFIX}/usr/bin" EXEC_DIR="${PREFIX}/usr/bin"
BACKUP_DIR="${CONFIG_DIR}/autoinstall.bak.$(date +%s)" BACKUP_DIR_BASE="${CONFIG_DIR}/autoinstall.bak"
BACKUP_DIR="${BACKUP_DIR_BASE}.$(date +%s)"
### packages ### packages
FILE_RUAB_PKG="${PKG_DIR}/ruantiblock_${RUAB_VERSION}_all.ipk" FILE_RUAB_PKG="${PKG_DIR}/ruantiblock_${RUAB_VERSION}_all.ipk"
FILE_MOD_LUA_PKG="${PKG_DIR}/ruantiblock-mod-lua_${RUAB_MOD_LUA_VERSION}_all.ipk" FILE_MOD_LUA_PKG="${PKG_DIR}/ruantiblock-mod-lua_${RUAB_MOD_LUA_VERSION}_all.ipk"
@@ -120,7 +121,7 @@ BackupFile() {
BackupCurrentConfig() { BackupCurrentConfig() {
local _file local _file
MakeDir "$BACKUP_DIR" MakeDir "$BACKUP_DIR"
for _file in $(ls -1 "$CONFIG_DIR" | grep -v "$(basename $BACKUP_DIR)") for _file in $(ls -1 "$CONFIG_DIR" | grep -v "$(basename $BACKUP_DIR_BASE)*")
do do
cp -af "${CONFIG_DIR}/${_file}" "${BACKUP_DIR}/${_file}" cp -af "${CONFIG_DIR}/${_file}" "${BACKUP_DIR}/${_file}"
done done
autoinstall/2.x/uninstall.sh
+3 -2
View File
@@ -7,7 +7,8 @@ PREFIX=""
CONFIG_DIR="${PREFIX}/etc/ruantiblock" CONFIG_DIR="${PREFIX}/etc/ruantiblock"
USER_LISTS_DIR="${CONFIG_DIR}/user_lists" USER_LISTS_DIR="${CONFIG_DIR}/user_lists"
EXEC_DIR="${PREFIX}/usr/bin" EXEC_DIR="${PREFIX}/usr/bin"
BACKUP_DIR="${CONFIG_DIR}/autoinstall.bak.$(date +%s)" BACKUP_DIR_BASE="${CONFIG_DIR}/autoinstall.bak"
BACKUP_DIR="${BACKUP_DIR_BASE}.$(date +%s)"
HTDOCS_VIEW="${PREFIX}/www/luci-static/resources/view" HTDOCS_VIEW="${PREFIX}/www/luci-static/resources/view"
HTDOCS_RUAB="${HTDOCS_VIEW}/ruantiblock" HTDOCS_RUAB="${HTDOCS_VIEW}/ruantiblock"
CRONTAB_FILE="/etc/crontabs/root" CRONTAB_FILE="/etc/crontabs/root"
@@ -61,7 +62,7 @@ RemoveFile() {
BackupCurrentConfig() { BackupCurrentConfig() {
local _file local _file
MakeDir "$BACKUP_DIR" MakeDir "$BACKUP_DIR"
for _file in $(ls -1 "$CONFIG_DIR" | grep -v "$(basename $BACKUP_DIR)") for _file in $(ls -1 "$CONFIG_DIR" | grep -v "$(basename $BACKUP_DIR_BASE)*")
do do
cp -af "${CONFIG_DIR}/${_file}" "${BACKUP_DIR}/${_file}" cp -af "${CONFIG_DIR}/${_file}" "${BACKUP_DIR}/${_file}"
done done