mirror of
https://github.com/kenzok8/small-package.git
synced 2026-02-06 06:46:54 +08:00
update 2025-11-18 20:48:22
This commit is contained in:
kenzok8
@@ -5,12 +5,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=filebrowser
|
||||
PKG_VERSION:=2.48.1
|
||||
PKG_VERSION:=2.48.2
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/filebrowser/filebrowser/tar.gz/v${PKG_VERSION}?
|
||||
PKG_HASH:=556b8092c69b65c11d917c8d1e0fef418ea88a9d437c2ec7b1cab506973eb743
|
||||
PKG_HASH:=382067b272689fac9f9edf293ff91941c20b7c45e58dc6d8d7330a7f08e81596
|
||||
|
||||
PKG_LICENSE:=Apache-2.0
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_VERSION:=1.1.4-r1
|
||||
PKG_VERSION:=1.1.5-r2
|
||||
PKG_RELEASE:=
|
||||
|
||||
LUCI_TITLE:=LuCI support for shadowrt
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
# This file is interpreted as shell script.
|
||||
# Put your custom iptables rules here, they will
|
||||
# be executed with each firewall (re-)start.
|
||||
|
||||
# Internal uci firewall chains are flushed and recreated on reload, so
|
||||
# put custom rules into the root chains e.g. INPUT or FORWARD or into the
|
||||
# special user chains, e.g. input_wan_rule or postrouting_lan_rule.
|
||||
|
||||
# workaround route shortcut issue in shadowrt clones on openwrt 22.03
|
||||
iptables -t mangle -I PREROUTING -p tcp -m conntrack --ctstate RELATED,ESTABLISHED -m socket -j ACCEPT || true
|
||||
ip6tables -t mangle -I PREROUTING -p tcp -m conntrack --ctstate RELATED,ESTABLISHED -m socket -j ACCEPT || true
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
#!/bin/sh
|
||||
|
||||
function get_config_wechatpush(){
|
||||
while [[ "$*" != "" ]]; do
|
||||
eval ${1}='`uci get wechatpush.config.$1`' 2>/dev/null
|
||||
uci del wechatpush.config.$1 2>/dev/null
|
||||
uci commit wechatpush
|
||||
shift
|
||||
done
|
||||
}
|
||||
|
||||
get_config_wechatpush "chat_id"
|
||||
[ -n "$chat_id" ] && uci set wechatpush.config.tg_chat_id="$chat_id"
|
||||
|
||||
rm -rf /tmp/luci-* >/dev/null 2>&1
|
||||
|
||||
@@ -9,7 +9,7 @@ LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker +docker-c
|
||||
|
||||
PKG_MAINTAINER:=tkme <tkme@qq.com>
|
||||
|
||||
PKG_VERSION:=1.0.0
|
||||
PKG_VERSION:=1.1.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
define Package/luci-app-zdinnav/conffiles
|
||||
|
||||
@@ -1,113 +1,113 @@
|
||||
msgid "Git website:"
|
||||
msgstr "git网址："
|
||||
|
||||
msgid "ZdinNav"
|
||||
msgstr "智淀导航"
|
||||
|
||||
msgid "ZdinNav software is a bookmark management tool for websites."
|
||||
msgstr "智淀导航：网站书签管理的工具，"
|
||||
|
||||
msgid "Default Ultra-Super Administrator:zdinnav Password:pwd123"
|
||||
msgstr "默认超高级管理员：zdinnav 密码：pwd123"
|
||||
|
||||
msgid "Config path"
|
||||
msgstr "配置文件路径"
|
||||
|
||||
msgid "Port"
|
||||
msgstr "端口"
|
||||
|
||||
msgid "Upgrade"
|
||||
msgstr "升级"
|
||||
|
||||
msgid "Apply"
|
||||
msgstr "应用"
|
||||
|
||||
msgid "Service Status"
|
||||
msgstr "运行状态"
|
||||
|
||||
msgid "Setup"
|
||||
msgstr "安装配置"
|
||||
|
||||
msgid "The following parameters will only take effect during installation or upgrade."
|
||||
msgstr "以下参数只在安装或升级时才生效。"
|
||||
|
||||
msgid "Takes effect when the database is initially created, or when the /ZdinNav/ folder under the configuration file path does not contain any data."
|
||||
msgstr "数据库初始化创建时有效，或者配置文件路径下的/ZdinNav/文件夹不包含数据时生效。"
|
||||
|
||||
msgid "Modifying errors may result in data loss or system failure to boot properly. Please proceed with caution!"
|
||||
msgstr "修改错误可能导致数据丢失或者系统无法正常启动，请谨慎操作！"
|
||||
|
||||
msgid "If you forget the super administrator passwor, you can <a href=\"javascript:void(0)\" onclick=\"onResetPassword()\">reset it here</a>"
|
||||
msgstr "如果忘记超级管理员密码可以<a href=\"javascript:void(0)\" onclick=\"onResetPassword()\">重置密码</a>"
|
||||
|
||||
msgid "If HTTPS is inaccessible, you can revert to <a href=\"javascript:void(0)\" onclick=\"onResetHttp()\">HTTP access here</a>."
|
||||
msgstr "https无法访问可以在这里还原<a href=\"javascript:void(0)\" onclick=\"onResetHttp()\">http访问</a>。"
|
||||
|
||||
msgid "Database Type"
|
||||
msgstr "数据类型"
|
||||
|
||||
msgid "Connection Settings"
|
||||
msgstr "数据库连接字符串"
|
||||
|
||||
msgid "Administrator Account"
|
||||
msgstr "管理员账号"
|
||||
|
||||
msgid "Password"
|
||||
msgstr "密码"
|
||||
|
||||
msgid "Enable Offline Installation"
|
||||
msgstr "离线安装"
|
||||
|
||||
msgid "Offline Installation Path"
|
||||
msgstr "离线安装说明"
|
||||
|
||||
msgid "Offline Installation Path Rules"
|
||||
msgstr "离线包上传路径"
|
||||
|
||||
msgid "Offline Installation Description"
|
||||
msgstr "推荐安装包类型："
|
||||
|
||||
msgid "Offline Installation Path Verify"
|
||||
msgstr "离线包检查"
|
||||
|
||||
msgid "Unable to find the installation package. Please place the package in the following directory:"
|
||||
msgstr "无法找到安装包，请将安装包放到："
|
||||
|
||||
msgid "(this path must not contain any other files)."
|
||||
msgstr "(该路径不能包含其他文件)。"
|
||||
|
||||
msgid "We've found the installation package."
|
||||
msgstr "安装包已经找到了。"
|
||||
|
||||
msgid "Status"
|
||||
msgstr "状态"
|
||||
|
||||
msgid "ZdinNav is running"
|
||||
msgstr "运行中"
|
||||
|
||||
msgid "ZdinNav is not running"
|
||||
msgstr "未运行"
|
||||
|
||||
msgid "Open ZdinNav"
|
||||
msgstr "进入界面"
|
||||
|
||||
msgid "The free space of Docker is less than 512M, which may cause the installation to fail."
|
||||
msgstr "Docker 可用空间已不足512M，可能导致安装失败。"
|
||||
|
||||
msgid "Are you sure you want to reset HTTP access?"
|
||||
msgstr "你确定重置http访问吗？"
|
||||
|
||||
msgid "Are you sure you want to reset the password to: pwd123?"
|
||||
msgstr "你确定重置密为：pwd123吗？"
|
||||
|
||||
msgid "The password reset has failed."
|
||||
msgstr "密码重置失败。"
|
||||
|
||||
msgid "Password reset successful."
|
||||
msgstr "密码已重置。"
|
||||
|
||||
msgid "HTTP reset failed. Please restart your soft router and try again!"
|
||||
msgstr "http重置失败，请重启软路由后再试！"
|
||||
|
||||
msgid "Switched to HTTP access."
|
||||
msgstr "已重置为http访问。"
|
||||
msgid "Git website:"
|
||||
msgstr "git网址："
|
||||
|
||||
msgid "ZdinNav"
|
||||
msgstr "智淀导航"
|
||||
|
||||
msgid "ZdinNav software is a bookmark management tool for websites."
|
||||
msgstr "智淀导航：网站书签管理的工具，"
|
||||
|
||||
msgid "Default Ultra-Super Administrator:zdinnav Password:pwd123"
|
||||
msgstr "默认超高级管理员：zdinnav 密码：pwd123"
|
||||
|
||||
msgid "Config path"
|
||||
msgstr "配置文件路径"
|
||||
|
||||
msgid "Port"
|
||||
msgstr "端口"
|
||||
|
||||
msgid "Upgrade"
|
||||
msgstr "升级"
|
||||
|
||||
msgid "Apply"
|
||||
msgstr "应用"
|
||||
|
||||
msgid "Service Status"
|
||||
msgstr "运行状态"
|
||||
|
||||
msgid "Setup"
|
||||
msgstr "安装配置"
|
||||
|
||||
msgid "The following parameters will only take effect during installation or upgrade."
|
||||
msgstr "以下参数只在安装或升级时才生效。"
|
||||
|
||||
msgid "Takes effect when the database is initially created, or when the /ZdinNav/ folder under the configuration file path does not contain any data."
|
||||
msgstr "数据库初始化创建时有效，或者配置文件路径下的/ZdinNav/文件夹不包含数据时生效。"
|
||||
|
||||
msgid "Modifying errors may result in data loss or system failure to boot properly. Please proceed with caution!"
|
||||
msgstr "修改错误可能导致数据丢失或者系统无法正常启动，请谨慎操作！"
|
||||
|
||||
msgid "If you forget the super administrator passwor, you can <a href=\"javascript:void(0)\" onclick=\"onResetPassword()\">reset it here</a>"
|
||||
msgstr "如果忘记超级管理员密码可以<a href=\"javascript:void(0)\" onclick=\"onResetPassword()\">重置密码</a>"
|
||||
|
||||
msgid "If HTTPS is inaccessible, you can revert to <a href=\"javascript:void(0)\" onclick=\"onResetHttp()\">HTTP access here</a>."
|
||||
msgstr "https无法访问可以在这里还原<a href=\"javascript:void(0)\" onclick=\"onResetHttp()\">http访问</a>。"
|
||||
|
||||
msgid "Database Type"
|
||||
msgstr "数据类型"
|
||||
|
||||
msgid "Connection Settings"
|
||||
msgstr "数据库连接字符串"
|
||||
|
||||
msgid "Administrator Account"
|
||||
msgstr "管理员账号"
|
||||
|
||||
msgid "Password"
|
||||
msgstr "密码"
|
||||
|
||||
msgid "Enable Offline Installation"
|
||||
msgstr "离线安装"
|
||||
|
||||
msgid "Offline Installation Path"
|
||||
msgstr "离线安装说明"
|
||||
|
||||
msgid "Offline Installation Path Rules"
|
||||
msgstr "离线包上传路径"
|
||||
|
||||
msgid "Offline Installation Description"
|
||||
msgstr "推荐安装包类型："
|
||||
|
||||
msgid "Offline Installation Path Verify"
|
||||
msgstr "离线包检查"
|
||||
|
||||
msgid "Unable to find the installation package. Please place the package in the following directory:"
|
||||
msgstr "无法找到安装包，请将安装包放到："
|
||||
|
||||
msgid "(this path must not contain any other files)."
|
||||
msgstr "(该路径不能包含其他文件)。"
|
||||
|
||||
msgid "We've found the installation package."
|
||||
msgstr "安装包已经找到了。"
|
||||
|
||||
msgid "Status"
|
||||
msgstr "状态"
|
||||
|
||||
msgid "ZdinNav is running"
|
||||
msgstr "运行中"
|
||||
|
||||
msgid "ZdinNav is not running"
|
||||
msgstr "未运行"
|
||||
|
||||
msgid "Open ZdinNav"
|
||||
msgstr "进入界面"
|
||||
|
||||
msgid "The free space of Docker is less than 512M, which may cause the installation to fail."
|
||||
msgstr "Docker 可用空间已不足512M，可能导致安装失败。"
|
||||
|
||||
msgid "Are you sure you want to reset HTTP access?"
|
||||
msgstr "你确定重置http访问吗？"
|
||||
|
||||
msgid "Are you sure you want to reset the password to: pwd123?"
|
||||
msgstr "你确定重置密为：pwd123吗？"
|
||||
|
||||
msgid "The password reset has failed."
|
||||
msgstr "密码重置失败。"
|
||||
|
||||
msgid "Password reset successful."
|
||||
msgstr "密码已重置。"
|
||||
|
||||
msgid "HTTP reset failed. Please restart your soft router and try again!"
|
||||
msgstr "http重置失败，请重启软路由后再试！"
|
||||
|
||||
msgid "Switched to HTTP access."
|
||||
msgstr "已重置为http访问。"
|
||||
|
||||
@@ -9,5 +9,6 @@ config main
|
||||
|
||||
config zdinnav_config
|
||||
option 'docker_url' 'tkme/zdinnav'
|
||||
option 'version_hub_url' 'https://registry.hub.docker.com/v2/repositories/tkme/zdinnav/tags/'
|
||||
option 'version_url' 'https://raw.githubusercontent.com/MyTkme/ZdinNav-Link/refs/heads/main/version/version.txt'
|
||||
option 'version' '1.0.0'
|
||||
|
||||
@@ -5,427 +5,490 @@ shift 1
|
||||
|
||||
# 获取当前型号对应的平台版本
|
||||
auto_arch() {
|
||||
case $(uname -m) in
|
||||
x86_64|amd64) echo "linux-amd64" ;;
|
||||
armv7l|armhf) echo "linux-arm" ;;
|
||||
aarch64|arm64) echo "linux-arm64" ;;
|
||||
*) echo "$(uname -m)" ;;
|
||||
esac
|
||||
case $(uname -m) in
|
||||
x86_64 | amd64) echo "linux-amd64" ;;
|
||||
armv7l | armhf) echo "linux-arm" ;;
|
||||
aarch64 | arm64) echo "linux-arm64" ;;
|
||||
*) echo "$(uname -m)" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# 创建文件夹
|
||||
create_folder() {
|
||||
local config_path="$1"
|
||||
[ ! -d "$config_path/logs" ] && mkdir -p "$config_path/logs"
|
||||
[ ! -d "$config_path/database" ] && mkdir -p "$config_path/database"
|
||||
[ ! -d "$config_path/configuration" ] && mkdir -p "$config_path/configuration"
|
||||
# 设置文件夹权限
|
||||
chmod -R 777 "$config_path"
|
||||
local config_path="$1"
|
||||
local config_account="$2"
|
||||
local config_password="$3"
|
||||
local config_database="$4"
|
||||
local config_connection="$5"
|
||||
[ ! -d "$config_path/logs" ] && mkdir -p "$config_path/logs"
|
||||
[ ! -d "$config_path/database" ] && mkdir -p "$config_path/database"
|
||||
[ ! -d "$config_path/configuration" ] && mkdir -p "$config_path/configuration"
|
||||
# 设置文件夹权限
|
||||
chmod -R 777 "$config_path"
|
||||
|
||||
# 数据库初始化配置
|
||||
sed -e "s|ACCOUNT_VAR|${config_account}|g" \
|
||||
-e "s|PASSWORD_VAR|${config_password}|g" \
|
||||
"/usr/share/zdinnav/initializeData.json" >"${config_path}/configuration/initializeData.json"
|
||||
# 系统配置文件
|
||||
sed -e "s|DBTYPE_VAR|${config_database}|g" \
|
||||
-e "s|CONNECTIONSTRING_VAR|${config_connection}|g" \
|
||||
"/usr/share/zdinnav/zdinNavSettings.json" >"${config_path}/configuration/zdinNavSettings.json"
|
||||
}
|
||||
|
||||
# 创建docker可以执行的接口命令
|
||||
do_create_command() {
|
||||
local content="$1"
|
||||
local config=$(uci get zdinnav.@main[0].config_path 2>/dev/null)
|
||||
local file_path="$config/configuration/command.txt"
|
||||
local dir_path=$(dirname "$file_path")
|
||||
|
||||
# 检查目录是否存在，不存在则创建
|
||||
if [ ! -d "$dir_path" ]; then
|
||||
mkdir -p "$dir_path"
|
||||
fi
|
||||
local content="$1"
|
||||
local config=$(uci get zdinnav.@main[0].config_path 2>/dev/null)
|
||||
local file_path="$config/configuration/command.txt"
|
||||
local dir_path=$(dirname "$file_path")
|
||||
|
||||
# 添加内容
|
||||
echo "$content" >> "$file_path"
|
||||
# 设置777权限
|
||||
chmod 777 "$file_path"
|
||||
# 检查目录是否存在，不存在则创建
|
||||
if [ ! -d "$dir_path" ]; then
|
||||
mkdir -p "$dir_path"
|
||||
fi
|
||||
|
||||
# 添加内容
|
||||
echo "$content" >>"$file_path"
|
||||
# 设置777权限
|
||||
chmod 777 "$file_path"
|
||||
}
|
||||
|
||||
# 重置http访问
|
||||
do_reset_http() {
|
||||
local config=$(uci get zdinnav.@main[0].config_path 2>/dev/null)
|
||||
# 设置权限
|
||||
chmod -R 777 "$config"
|
||||
# 删除文件
|
||||
if [ -f "${config}/configuration/SSLSettings.json" ]; then
|
||||
rm -f "${config}/configuration/SSLSettings.json" && echo 1 || echo 0
|
||||
else
|
||||
echo 1
|
||||
fi
|
||||
# 创建重置http命令
|
||||
do_create_command "RESETHTTP"
|
||||
# 重启docker
|
||||
cd $config && docker-compose restart
|
||||
local config=$(uci get zdinnav.@main[0].config_path 2>/dev/null)
|
||||
# 设置权限
|
||||
chmod -R 777 "$config"
|
||||
# 删除文件
|
||||
if [ -f "${config}/configuration/ZdinNav.pfx" ]; then
|
||||
rm -f "${config}/configuration/ZdinNav.pfx"
|
||||
fi
|
||||
if [ -f "${config}/configuration/SSLSettings.json" ]; then
|
||||
rm -f "${config}/configuration/SSLSettings.json" && echo 1 || echo 0
|
||||
else
|
||||
echo 1
|
||||
fi
|
||||
# 创建重置http命令
|
||||
do_create_command "RESETHTTP"
|
||||
# 重启docker
|
||||
cd $config && docker-compose restart
|
||||
}
|
||||
|
||||
# 重置超级管理员密码
|
||||
do_reset_administrator_password() {
|
||||
# 创建重置密码命令
|
||||
do_create_command "RESETPASSWORD"
|
||||
# 重启docker
|
||||
local config=$(uci get zdinnav.@main[0].config_path 2>/dev/null)
|
||||
cd $config && docker-compose restart
|
||||
echo 1
|
||||
# 创建重置密码命令
|
||||
do_create_command "RESETPASSWORD"
|
||||
# 重启docker
|
||||
local config=$(uci get zdinnav.@main[0].config_path 2>/dev/null)
|
||||
cd $config && docker-compose restart
|
||||
echo 1
|
||||
}
|
||||
|
||||
# 检查安离线装包是否存在
|
||||
do_check_package() {
|
||||
local latest_tar=$(ls -t "$1/downloads/"*.tar 2>/dev/null | head -n 1)
|
||||
if [ -n "$latest_tar" ]; then
|
||||
echo 1
|
||||
else
|
||||
echo 0
|
||||
fi
|
||||
local latest_tar=$(ls -t "$1/downloads/"*.tar 2>/dev/null | head -n 1)
|
||||
if [ -n "$latest_tar" ]; then
|
||||
echo 1
|
||||
else
|
||||
echo 0
|
||||
fi
|
||||
}
|
||||
|
||||
# 获取访问类型：http、https
|
||||
do_protocol() {
|
||||
local config=$(uci get zdinnav.@main[0].config_path 2>/dev/null)
|
||||
if [ -f "${config}/configuration/SSLSettings.json" ]; then
|
||||
echo "https"
|
||||
else
|
||||
echo "http"
|
||||
fi
|
||||
local config=$(uci get zdinnav.@main[0].config_path 2>/dev/null)
|
||||
if [ -f "${config}/configuration/SSLSettings.json" ]; then
|
||||
echo "https"
|
||||
else
|
||||
echo "http"
|
||||
fi
|
||||
}
|
||||
|
||||
# 版本号比较：1=发现新版本、0=不需要更新
|
||||
compare_versions() {
|
||||
# 服务器版本号
|
||||
local server_ver=$(echo "$1" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1)
|
||||
# 当前版本号
|
||||
local current_ver=$(echo "$2" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1)
|
||||
# 提取数字部分
|
||||
local server_digits=$(echo "$server_ver" | sed 's/[^0-9]/ /g' | tr ' ' '\n' | grep -v '^$' | tr '\n' ' ')
|
||||
local current_digits=$(echo "$current_ver" | sed 's/[^0-9]/ /g' | tr ' ' '\n' | grep -v '^$' | tr '\n' ' ')
|
||||
# 比较主版本号
|
||||
local server_major=$(echo "$server_digits" | cut -d' ' -f1)
|
||||
local current_major=$(echo "$current_digits" | cut -d' ' -f1)
|
||||
if [ "$server_major" -gt "$current_major" ]; then
|
||||
echo 1
|
||||
return
|
||||
elif [ "$server_major" -lt "$current_major" ]; then
|
||||
echo 0
|
||||
return
|
||||
fi
|
||||
|
||||
# 比较次版本号
|
||||
server_minor=$(echo "$server_digits" | cut -d' ' -f2)
|
||||
current_minor=$(echo "$current_digits" | cut -d' ' -f2)
|
||||
server_minor=${server_minor:-0}
|
||||
current_minor=${current_minor:-0}
|
||||
if [ "$server_minor" -gt "$current_minor" ]; then
|
||||
echo 1
|
||||
return
|
||||
elif [ "$server_minor" -lt "$current_minor" ]; then
|
||||
echo 0
|
||||
return
|
||||
fi
|
||||
|
||||
# 比较修订版本号
|
||||
server_patch=$(echo "$server_digits" | cut -d' ' -f3)
|
||||
current_patch=$(echo "$current_digits" | cut -d' ' -f3)
|
||||
server_patch=${server_patch:-0}
|
||||
current_patch=${current_patch:-0}
|
||||
if [ "$server_patch" -gt "$current_patch" ]; then
|
||||
echo 1
|
||||
return
|
||||
else
|
||||
echo 0
|
||||
return
|
||||
fi
|
||||
# 服务器版本号
|
||||
local server_ver=$(echo "$1" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1)
|
||||
# 当前版本号
|
||||
local current_ver=$(echo "$2" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1)
|
||||
# 提取数字部分
|
||||
local server_digits=$(echo "$server_ver" | sed 's/[^0-9]/ /g' | tr ' ' '\n' | grep -v '^$' | tr '\n' ' ')
|
||||
local current_digits=$(echo "$current_ver" | sed 's/[^0-9]/ /g' | tr ' ' '\n' | grep -v '^$' | tr '\n' ' ')
|
||||
# 比较主版本号
|
||||
local server_major=$(echo "$server_digits" | cut -d' ' -f1)
|
||||
local current_major=$(echo "$current_digits" | cut -d' ' -f1)
|
||||
if [ "$server_major" -gt "$current_major" ]; then
|
||||
echo 1
|
||||
return
|
||||
elif [ "$server_major" -lt "$current_major" ]; then
|
||||
echo 0
|
||||
return
|
||||
fi
|
||||
|
||||
# 比较次版本号
|
||||
server_minor=$(echo "$server_digits" | cut -d' ' -f2)
|
||||
current_minor=$(echo "$current_digits" | cut -d' ' -f2)
|
||||
server_minor=${server_minor:-0}
|
||||
current_minor=${current_minor:-0}
|
||||
if [ "$server_minor" -gt "$current_minor" ]; then
|
||||
echo 1
|
||||
return
|
||||
elif [ "$server_minor" -lt "$current_minor" ]; then
|
||||
echo 0
|
||||
return
|
||||
fi
|
||||
|
||||
# 比较修订版本号
|
||||
server_patch=$(echo "$server_digits" | cut -d' ' -f3)
|
||||
current_patch=$(echo "$current_digits" | cut -d' ' -f3)
|
||||
server_patch=${server_patch:-0}
|
||||
current_patch=${current_patch:-0}
|
||||
if [ "$server_patch" -gt "$current_patch" ]; then
|
||||
echo 1
|
||||
return
|
||||
else
|
||||
echo 0
|
||||
return
|
||||
fi
|
||||
}
|
||||
|
||||
# 获取最新版号
|
||||
get_version() {
|
||||
local platform="$1"
|
||||
local version_url=`uci get zdinnav.@zdinnav_config[0].version_url 2>/dev/null`
|
||||
local content=""
|
||||
|
||||
if [ -z "$platform" ]; then
|
||||
echo "无法获取当前支持的平台类型无法安装。Unable to determine the supported platform type. Installation cannot proceed." >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
if command -v wget >/dev/null 2>&1; then
|
||||
content=$(wget -q -O - "$version_url" 2>/dev/null)
|
||||
elif command -v curl >/dev/null 2>&1; then
|
||||
content=$(curl -s -f "$version_url" 2>/dev/null)
|
||||
else
|
||||
echo "获更新失败: 需要 wget 或 curl 工具。Update failed: wget or curl tools are required." >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ $? -ne 0 ] || [ -z "$content" ]; then
|
||||
echo "URL请求失败，网络不稳定，目前无法访问。URL request failed: Unstable network connection, currently inaccessible." >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
# 匹配指定的型号版本
|
||||
local version_line=$(echo "$content" | grep -i "[[:space:]]*$platform[[:space:]]*:[[:space:]]*")
|
||||
# 调试输出获取到的内容
|
||||
# echo "内容预览:" >&2
|
||||
# echo "$content" | head -5 >&2
|
||||
if [ -z "$version_line" ]; then
|
||||
echo "当前可能不支持 '$platform' 平台的安装，更多信息访问git。Installation on '$platform' platform may not be supported at this time. For more information, visit git." >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
# 字符串截取：aaa:bbb 只获取bbb
|
||||
local version=$(echo "$version_line" | sed 's/.*://' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
|
||||
if [ -z "$version" ]; then
|
||||
echo "更新失败，无法获取最新版本号。Update failed: unable to retrieve the latest version number." >&2
|
||||
return 1
|
||||
fi
|
||||
echo "$version"
|
||||
local platform="$1"
|
||||
local version_url=$(uci get zdinnav.@zdinnav_config[0].version_url 2>/dev/null)
|
||||
local version_hub_url=$(uci get zdinnav.@zdinnav_config[0].version_hub_url 2>/dev/null)
|
||||
local content=""
|
||||
|
||||
# 检查wget是否安装
|
||||
if ! which wget >/dev/null 2>&1; then
|
||||
echo "错误: wget未安装！Error: wget is not installed!" >&2
|
||||
echo "请使用以下命令安装wget：Please use the following commands to install wget:" >&2
|
||||
echo "1. 更新软件包列表: opkg update。1. Update package list: opkg update." >&2
|
||||
echo "2. 安装wget: opkg install wget。2. Install wget: opkg install wget." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# hub官网获取最新版
|
||||
local version_last=$(wget --no-check-certificate -q -O - "$version_hub_url" |
|
||||
grep -o '"name":"[^"]*"' |
|
||||
grep -o '[0-9]*\.[0-9]*\.[0-9]*' |
|
||||
sort -t '.' -n -k1,1 -k2,2 -k3,3 |
|
||||
tail -1)
|
||||
|
||||
if [ -n "$version_last" ]; then
|
||||
echo "$version_last"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -z "$platform" ]; then
|
||||
echo "无法获取当前支持的平台类型无法安装。Unable to determine the supported platform type. Installation cannot proceed." >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Github 获取最新版逻辑
|
||||
content=$(wget --no-check-certificate -q -O - "$version_url" 2>/dev/null)
|
||||
if [ $? -ne 0 ] || [ -z "$content" ]; then
|
||||
echo "URL请求失败，网络不稳定，目前无法访问。URL request failed: Unstable network connection, currently inaccessible." >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
# 匹配指定的型号版本
|
||||
local version_line=$(echo "$content" | grep -i "[[:space:]]*$platform[[:space:]]*:[[:space:]]*")
|
||||
# 调试输出获取到的内容
|
||||
# echo "内容预览:" >&2
|
||||
# echo "$content" | head -5 >&2
|
||||
if [ -z "$version_line" ]; then
|
||||
echo "当前可能不支持 '$platform' 平台的安装，更多信息访问git。Installation on '$platform' platform may not be supported at this time. For more information, visit git." >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
# 字符串截取：aaa:bbb 只获取bbb
|
||||
local version=$(echo "$version_line" | sed 's/.*://' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
|
||||
if [ -z "$version" ]; then
|
||||
echo "更新失败，无法获取最新版本号。Update failed: unable to retrieve the latest version number." >&2
|
||||
return 1
|
||||
fi
|
||||
echo "$version"
|
||||
}
|
||||
|
||||
# 合并配置文件
|
||||
merge_config() {
|
||||
local zdinnav_config="/etc/config/zdinnav"
|
||||
local zdinnav_config_opkg="/etc/config/zdinnav-opkg"
|
||||
# 检查是否需要合并
|
||||
if [ ! -f "$zdinnav_config" ] || [ ! -f "$zdinnav_config_opkg" ]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
# 1.1.0 新加配置
|
||||
local version_hub_url=$(uci get zdinnav.@zdinnav_config[0].version_hub_url 2>/dev/null)
|
||||
if [ -z "$version_hub_url" ]; then
|
||||
local version_hub_url_opkg=$(uci get zdinnav-opkg.@zdinnav_config[0].version_hub_url 2>/dev/null)
|
||||
uci set zdinnav.@zdinnav_config[0].version_hub_url=$version_hub_url_opkg
|
||||
fi
|
||||
|
||||
# 提交配置
|
||||
uci commit zdinnav
|
||||
# 删除新版配置文件
|
||||
chmod 777 "$zdinnav_config_opkg" 2>/dev/null
|
||||
rm -f "$zdinnav_config_opkg"
|
||||
}
|
||||
|
||||
do_install() {
|
||||
local port=`uci get zdinnav.@main[0].port 2>/dev/null`
|
||||
local config=`uci get zdinnav.@main[0].config_path 2>/dev/null`
|
||||
local docker_url=`uci get zdinnav.@zdinnav_config[0].docker_url 2>/dev/null`
|
||||
local version=`uci get zdinnav.@zdinnav_config[0].version 2>/dev/null`
|
||||
local offline_installation=`uci get zdinnav.@main[0].enable_offline_installation 2>/dev/null`
|
||||
local zdinnav_account=`uci get zdinnav.@main[0].administrator_account 2>/dev/null`
|
||||
local zdinnav_password=`uci get zdinnav.@main[0].administrator_password 2>/dev/null`
|
||||
local zdinnav_database=`uci get zdinnav.@main[0].database_type 2>/dev/null`
|
||||
local zdinnav_connection=`uci get zdinnav.@main[0].connection_settings 2>/dev/null`
|
||||
local latest_tar=""
|
||||
# 检查配置是否需要合并
|
||||
merge_config
|
||||
# 读取配置文件数据
|
||||
local port=$(uci get zdinnav.@main[0].port 2>/dev/null)
|
||||
local config=$(uci get zdinnav.@main[0].config_path 2>/dev/null)
|
||||
local docker_url=$(uci get zdinnav.@zdinnav_config[0].docker_url 2>/dev/null)
|
||||
local version=$(uci get zdinnav.@zdinnav_config[0].version 2>/dev/null)
|
||||
local offline_installation=$(uci get zdinnav.@main[0].enable_offline_installation 2>/dev/null)
|
||||
local zdinnav_account=$(uci get zdinnav.@main[0].administrator_account 2>/dev/null)
|
||||
local zdinnav_password=$(uci get zdinnav.@main[0].administrator_password 2>/dev/null)
|
||||
local zdinnav_database=$(uci get zdinnav.@main[0].database_type 2>/dev/null)
|
||||
local zdinnav_connection=$(uci get zdinnav.@main[0].connection_settings 2>/dev/null)
|
||||
local latest_tar=""
|
||||
|
||||
if [ -z "$config" ]; then
|
||||
echo "config path is empty!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "$config" ]; then
|
||||
echo "config path is empty!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p $config
|
||||
RET=$?
|
||||
if [ ! "$RET" = "0" ]; then
|
||||
echo "mkdir config path failed"
|
||||
exit 1
|
||||
fi
|
||||
mkdir -p $config
|
||||
RET=$?
|
||||
if [ ! "$RET" = "0" ]; then
|
||||
echo "mkdir config path failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# 离线安装检查安装包是否存在，不存在抛出提示
|
||||
if [ "$offline_installation" = "1" ]; then
|
||||
latest_tar=$(ls -t "$config/downloads/"*.tar 2>/dev/null | head -n 1)
|
||||
if [ -n "$latest_tar" ]; then
|
||||
local basename="${latest_tar%.tar}"
|
||||
# 获取版本号:zdinnav_linux-amd64-1.0.0.tar 返回：linux-amd64-1.0.0
|
||||
local version_local="${basename#*_}"
|
||||
if [ -z "$version_local" ]; then
|
||||
echo "无法解析安装包，请不要修改安装包文件名。Unable to parse the installation package. Do not modify its file name."
|
||||
exit 1
|
||||
fi
|
||||
# 停止并删除并旧版本
|
||||
local docker_state=$(docker ps --all -f 'name=^/zdinnav' --format '{{.State}}')
|
||||
if [ -n "$docker_state" ]; then
|
||||
if [ "$docker_state" = "running" ]; then
|
||||
docker stop zdinnav
|
||||
fi
|
||||
docker rm zdinnav
|
||||
fi
|
||||
if [[ "$(docker images -q $docker_url:$version 2> /dev/null)" != "" ]]; then
|
||||
docker rmi "$docker_url:$version"
|
||||
fi
|
||||
# 安装docker离线文件
|
||||
docker load -i "$latest_tar"
|
||||
if [ ! "$?" = "0" ]; then
|
||||
echo "docker load 执行失败，请检查*.tar安装包是否正确。The 'docker load' command failed. Please verify the integrity of the *.tar file."
|
||||
exit 1
|
||||
fi
|
||||
version=$version_local
|
||||
# 离线安装版本检查
|
||||
local zdinnav_tag=$(docker images --format "{{.Repository}} {{.Tag}} {{.CreatedAt}}" | grep -E ".*/zdinnav" | sort -r | head -n 1 | awk '{print $2}')
|
||||
if [ "$zdinnav_tag" != "$version"]; then
|
||||
echo "安装失败，请重新下载安装包，下载后勿修改，放至指定位置后重装。Installation failed. Redownload the package unmodified, move it to the specified location, and retry installation."
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "无法找到安装包。Cannot find the installation package."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
if [ "$offline_installation" = "1" ]; then
|
||||
# 离线安装(检查安装包是否存在需要检查安装包是否存在)
|
||||
latest_tar=$(ls -t "$config/downloads/"*.tar 2>/dev/null | head -n 1)
|
||||
if [ -n "$latest_tar" ]; then
|
||||
local basename="${latest_tar%.tar}"
|
||||
# 获取版本号:zdinnav_linux-amd64-1.0.0.tar 返回：linux-amd64-1.0.0
|
||||
local version_local="${basename#*_}"
|
||||
if [ -z "$version_local" ]; then
|
||||
echo "无法解析安装包，请不要修改安装包文件名。Unable to parse the installation package. Do not modify its file name."
|
||||
exit 1
|
||||
fi
|
||||
# 停止并删除并旧版本
|
||||
local docker_state=$(docker ps --all -f 'name=^/zdinnav' --format '{{.State}}')
|
||||
if [ -n "$docker_state" ]; then
|
||||
if [ "$docker_state" = "running" ]; then
|
||||
docker stop zdinnav
|
||||
fi
|
||||
docker rm zdinnav
|
||||
fi
|
||||
if [[ "$(docker images -q $docker_url:$version 2>/dev/null)" != "" ]]; then
|
||||
docker rmi "$docker_url:$version"
|
||||
fi
|
||||
# 安装docker离线文件
|
||||
docker load -i "$latest_tar"
|
||||
if [ ! "$?" = "0" ]; then
|
||||
echo "docker load 执行失败，请检查*.tar安装包是否正确。The 'docker load' command failed. Please verify the integrity of the *.tar file."
|
||||
exit 1
|
||||
fi
|
||||
version=$version_local
|
||||
# 离线安装版本检查
|
||||
local zdinnav_tag=$(docker images --format "{{.Repository}} {{.Tag}} {{.CreatedAt}}" | grep -E ".*/zdinnav" | sort -r | head -n 1 | awk '{print $2}')
|
||||
if [ "$zdinnav_tag" != "$version"]; then
|
||||
echo "安装失败，请重新下载安装包，下载后勿修改，放至指定位置后重装。Installation failed. Redownload the package unmodified, move it to the specified location, and retry installation."
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "无法找到安装包。Cannot find the installation package."
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
# 在线安装，每次安装检查是否存在最新版本
|
||||
local latest_version=$(get_version "$(auto_arch)")
|
||||
local is_update=$(compare_versions "$latest_version" "$version")
|
||||
if [ "$is_update" = "1" ]; then
|
||||
version=$latest_version
|
||||
fi
|
||||
fi
|
||||
|
||||
[ -z $port ] && port=9200
|
||||
sed -e "s|PORT_VAR|${port}|g" \
|
||||
-e "s|CONFIG_PATH_VAR|${config}|g" \
|
||||
-e "s|DOCKER_URL_VAR|${docker_url}|g" \
|
||||
-e "s|VERSION_VAR|${version}|g" \
|
||||
"/usr/share/zdinnav/docker-compose.template.yaml" > "${config}/docker-compose.yaml"
|
||||
RET=$?
|
||||
if [ ! "$RET" = "0" ]; then
|
||||
echo "convert docker-compose.yaml failed"
|
||||
exit 1
|
||||
fi
|
||||
[ -z $port ] && port=9200
|
||||
sed -e "s|PORT_VAR|${port}|g" \
|
||||
-e "s|CONFIG_PATH_VAR|${config}|g" \
|
||||
-e "s|DOCKER_URL_VAR|${docker_url}|g" \
|
||||
-e "s|VERSION_VAR|${version}|g" \
|
||||
"/usr/share/zdinnav/docker-compose.template.yaml" >"${config}/docker-compose.yaml"
|
||||
RET=$?
|
||||
if [ ! "$RET" = "0" ]; then
|
||||
echo "convert docker-compose.yaml failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# 创建文件夹
|
||||
$(create_folder "$config")
|
||||
# 创建文件夹，创建配置文件
|
||||
$(create_folder "$config" "$zdinnav_account" "$zdinnav_password" "$zdinnav_database" "$zdinnav_connection")
|
||||
|
||||
# 数据库初始化配置
|
||||
sed -e "s|ACCOUNT_VAR|${zdinnav_account}|g" \
|
||||
-e "s|PASSWORD_VAR|${zdinnav_password}|g" \
|
||||
"/usr/share/zdinnav/initializeData.json" > "${config}/configuration/initializeData.json"
|
||||
sed -e "s|DBTYPE_VAR|${zdinnav_database}|g" \
|
||||
-e "s|CONNECTIONSTRING_VAR|${zdinnav_connection}|g" \
|
||||
"/usr/share/zdinnav/zdinNavSettings.json" > "${config}/configuration/zdinNavSettings.json"
|
||||
cd $config
|
||||
|
||||
cd $config
|
||||
docker-compose down || true
|
||||
docker-compose up -d
|
||||
|
||||
docker-compose down || true
|
||||
docker-compose up -d
|
||||
# 离线安装时，校验
|
||||
if [ "$offline_installation" = "1" ]; then
|
||||
# 休眠3秒后，校验是否正常运行
|
||||
sleep 3
|
||||
local zdinnav_State=$(docker ps --all -f 'name=^/zdinnav' --format '{{.State}}')
|
||||
if [[ -z "$zdinnav_State" || "$zdinnav_State" != "running" ]]; then
|
||||
echo "智淀导航运行失败，请检查*.tar安装包是否支持该平台。The zdinnav application failed to start. Ensure the *.tar package is compatible with the current platform."
|
||||
# 移除错误docker数据
|
||||
docker stop zdinnav
|
||||
docker rm zdinnav
|
||||
docker rmi "$docker_url:$version"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# 离线安装时，校验
|
||||
if [ "$offline_installation" = "1" ]; then
|
||||
# 休眠3秒后，校验是否正常运行
|
||||
sleep 3
|
||||
local zdinnav_State=$(docker ps --all -f 'name=^/zdinnav' --format '{{.State}}')
|
||||
if [[ -z "$zdinnav_State" || "$zdinnav_State" != "running" ]]; then
|
||||
echo "智淀导航运行失败，请检查*.tar安装包是否支持该平台。The zdinnav application failed to start. Ensure the *.tar package is compatible with the current platform."
|
||||
# 移除错误docker数据
|
||||
docker stop zdinnav
|
||||
docker rm zdinnav
|
||||
docker rmi "$docker_url:$version"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
# 更新版本记录
|
||||
uci set zdinnav.@zdinnav_config[0].version=$version
|
||||
uci commit zdinnav
|
||||
|
||||
# 更新版本记录
|
||||
uci set zdinnav.@zdinnav_config[0].version=$version
|
||||
uci commit zdinnav
|
||||
|
||||
if [[ -n "$latest_tar" && -f "$latest_tar" ]]; then
|
||||
rm -f "$latest_tar"
|
||||
fi
|
||||
if [[ -n "$latest_tar" && -f "$latest_tar" ]]; then
|
||||
rm -f "$latest_tar"
|
||||
fi
|
||||
}
|
||||
|
||||
# 升级/应用
|
||||
do_upgrade() {
|
||||
local port=`uci get zdinnav.@main[0].port 2>/dev/null`
|
||||
local config=`uci get zdinnav.@main[0].config_path 2>/dev/null`
|
||||
local docker_url=`uci get zdinnav.@zdinnav_config[0].docker_url 2>/dev/null`
|
||||
local version=`uci get zdinnav.@zdinnav_config[0].version 2>/dev/null`
|
||||
if [ -z "$config" ]; then
|
||||
echo "config path is empty!"
|
||||
exit 1
|
||||
fi
|
||||
# 检查配置是否需要合并
|
||||
merge_config
|
||||
# 读取配置文件数据
|
||||
local port=$(uci get zdinnav.@main[0].port 2>/dev/null)
|
||||
local config=$(uci get zdinnav.@main[0].config_path 2>/dev/null)
|
||||
local docker_url=$(uci get zdinnav.@zdinnav_config[0].docker_url 2>/dev/null)
|
||||
local version=$(uci get zdinnav.@zdinnav_config[0].version 2>/dev/null)
|
||||
local zdinnav_account=$(uci get zdinnav.@main[0].administrator_account 2>/dev/null)
|
||||
local zdinnav_password=$(uci get zdinnav.@main[0].administrator_password 2>/dev/null)
|
||||
local zdinnav_database=$(uci get zdinnav.@main[0].database_type 2>/dev/null)
|
||||
local zdinnav_connection=$(uci get zdinnav.@main[0].connection_settings 2>/dev/null)
|
||||
if [ -z "$config" ]; then
|
||||
echo "config path is empty!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p $config
|
||||
RET=$?
|
||||
if [ ! "$RET" = "0" ]; then
|
||||
echo "mkdir config path failed"
|
||||
exit 1
|
||||
fi
|
||||
mkdir -p $config
|
||||
RET=$?
|
||||
if [ ! "$RET" = "0" ]; then
|
||||
echo "mkdir config path failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# 获取最新版
|
||||
local latest_version=$(get_version "$(auto_arch)")
|
||||
local is_update=$(compare_versions "$latest_version" "$version")
|
||||
# 获取最新版
|
||||
local latest_version=$(get_version "$(auto_arch)")
|
||||
local is_update=$(compare_versions "$latest_version" "$version")
|
||||
|
||||
# 检查是否需要升级应用
|
||||
if [ "$is_update" = "1" ]; then
|
||||
echo "发现新版本：$latest_version。New version found: $latest_version."
|
||||
local docker_state=$(docker ps --all -f 'name=^/zdinnav' --format '{{.State}}')
|
||||
if [ -n "$docker_state" ]; then
|
||||
if [ "$docker_state" = "running" ]; then
|
||||
docker stop zdinnav
|
||||
fi
|
||||
docker rm zdinnav
|
||||
fi
|
||||
if [[ "$(docker images -q $docker_url:$version 2> /dev/null)" != "" ]]; then
|
||||
docker rmi "$docker_url:$version"
|
||||
fi
|
||||
# 更新版本
|
||||
version=$latest_version
|
||||
else
|
||||
if [[ -n "$latest_version" && "$latest_version" != "1" ]]; then
|
||||
echo "当前已经是最新版：$version。You're already on the latest version: $version."
|
||||
fi
|
||||
fi
|
||||
# 检查是否需要升级应用
|
||||
if [ "$is_update" = "1" ]; then
|
||||
echo "发现新版本：$latest_version。New version found: $latest_version."
|
||||
local docker_state=$(docker ps --all -f 'name=^/zdinnav' --format '{{.State}}')
|
||||
if [ -n "$docker_state" ]; then
|
||||
if [ "$docker_state" = "running" ]; then
|
||||
docker stop zdinnav
|
||||
fi
|
||||
docker rm zdinnav
|
||||
fi
|
||||
if [[ "$(docker images -q $docker_url:$version 2>/dev/null)" != "" ]]; then
|
||||
docker rmi "$docker_url:$version"
|
||||
fi
|
||||
# 更新版本
|
||||
version=$latest_version
|
||||
else
|
||||
if [[ -n "$latest_version" && "$latest_version" != "1" ]]; then
|
||||
echo "当前已经是最新版：$version。You're already on the latest version: $version."
|
||||
fi
|
||||
fi
|
||||
|
||||
[ -z $port ] && port=9200
|
||||
sed -e "s|PORT_VAR|${port}|g" \
|
||||
-e "s|CONFIG_PATH_VAR|${config}|g" \
|
||||
-e "s|DOCKER_URL_VAR|${docker_url}|g" \
|
||||
-e "s|VERSION_VAR|${version}|g" \
|
||||
"/usr/share/zdinnav/docker-compose.template.yaml" > "${config}/docker-compose.yaml"
|
||||
RET=$?
|
||||
if [ ! "$RET" = "0" ]; then
|
||||
echo "convert docker-compose.yaml failed"
|
||||
exit 1
|
||||
fi
|
||||
[ -z $port ] && port=9200
|
||||
sed -e "s|PORT_VAR|${port}|g" \
|
||||
-e "s|CONFIG_PATH_VAR|${config}|g" \
|
||||
-e "s|DOCKER_URL_VAR|${docker_url}|g" \
|
||||
-e "s|VERSION_VAR|${version}|g" \
|
||||
"/usr/share/zdinnav/docker-compose.template.yaml" >"${config}/docker-compose.yaml"
|
||||
RET=$?
|
||||
if [ ! "$RET" = "0" ]; then
|
||||
echo "convert docker-compose.yaml failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd $config
|
||||
# 创建文件夹
|
||||
$(create_folder "$config")
|
||||
|
||||
docker-compose down || true
|
||||
docker-compose up -d
|
||||
cd $config
|
||||
# 创建文件夹，创建配置文件
|
||||
$(create_folder "$config" "$zdinnav_account" "$zdinnav_password" "$zdinnav_database" "$zdinnav_connection")
|
||||
|
||||
# 更新版本记录
|
||||
uci set zdinnav.@zdinnav_config[0].version=$version
|
||||
uci commit zdinnav
|
||||
docker-compose down || true
|
||||
docker-compose up -d
|
||||
|
||||
# 更新版本记录
|
||||
uci set zdinnav.@zdinnav_config[0].version=$version
|
||||
uci commit zdinnav
|
||||
}
|
||||
|
||||
# 移除应用
|
||||
do_remove() {
|
||||
local docker_url=`uci get zdinnav.@zdinnav_config[0].docker_url 2>/dev/null`
|
||||
local version=`uci get zdinnav.@zdinnav_config[0].version 2>/dev/null`
|
||||
local docker_state=$(docker ps --all -f 'name=^/zdinnav' --format '{{.State}}')
|
||||
if [ -n "$docker_state" ]; then
|
||||
if [ "$docker_state" = "running" ]; then
|
||||
docker stop zdinnav
|
||||
fi
|
||||
docker rm zdinnav
|
||||
fi
|
||||
if [[ "$(docker images -q $docker_url:$version 2> /dev/null)" != "" ]]; then
|
||||
docker rmi "$docker_url:$version"
|
||||
fi
|
||||
local docker_url=$(uci get zdinnav.@zdinnav_config[0].docker_url 2>/dev/null)
|
||||
local version=$(uci get zdinnav.@zdinnav_config[0].version 2>/dev/null)
|
||||
local docker_state=$(docker ps --all -f 'name=^/zdinnav' --format '{{.State}}')
|
||||
if [ -n "$docker_state" ]; then
|
||||
if [ "$docker_state" = "running" ]; then
|
||||
docker stop zdinnav
|
||||
fi
|
||||
docker rm zdinnav
|
||||
fi
|
||||
if [[ "$(docker images -q $docker_url:$version 2>/dev/null)" != "" ]]; then
|
||||
docker rmi "$docker_url:$version"
|
||||
fi
|
||||
}
|
||||
|
||||
usage() {
|
||||
echo "usage: $0 sub-command"
|
||||
echo "where sub-command is one of:"
|
||||
echo " install Install the zdinnav"
|
||||
echo " upgrade Upgrade the zdinnav"
|
||||
echo " rm/start/stop/restart Remove/Start/Stop/Restart the zdinnav"
|
||||
echo " status ZdinNav status"
|
||||
echo " port ZdinNav port"
|
||||
echo "usage: $0 sub-command"
|
||||
echo "where sub-command is one of:"
|
||||
echo " install Install the zdinnav"
|
||||
echo " upgrade Upgrade the zdinnav"
|
||||
echo " rm/start/stop/restart Remove/Start/Stop/Restart the zdinnav"
|
||||
echo " status ZdinNav status"
|
||||
echo " port ZdinNav port"
|
||||
}
|
||||
|
||||
case ${ACTION} in
|
||||
"protocol")
|
||||
do_protocol
|
||||
;;
|
||||
"auto_get_arch")
|
||||
auto_arch
|
||||
;;
|
||||
"check_package")
|
||||
do_check_package "$1"
|
||||
;;
|
||||
"reset_http")
|
||||
do_reset_http
|
||||
;;
|
||||
"reset_password")
|
||||
do_reset_administrator_password
|
||||
;;
|
||||
"install")
|
||||
do_install
|
||||
;;
|
||||
"upgrade")
|
||||
do_upgrade
|
||||
;;
|
||||
"rm")
|
||||
do_remove
|
||||
;;
|
||||
"start" | "stop" | "restart")
|
||||
config=`uci get zdinnav.@main[0].config_path 2>/dev/null`
|
||||
cd $config && docker-compose ${ACTION}
|
||||
;;
|
||||
"status")
|
||||
docker ps --all -f 'name=^/zdinnav' --format '{{.State}}'
|
||||
;;
|
||||
"port")
|
||||
docker ps -all -f 'name=^/zdinnav' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
|
||||
;;
|
||||
*)
|
||||
usage
|
||||
exit 1
|
||||
;;
|
||||
"protocol")
|
||||
do_protocol
|
||||
;;
|
||||
"auto_get_arch")
|
||||
auto_arch
|
||||
;;
|
||||
"check_package")
|
||||
do_check_package "$1"
|
||||
;;
|
||||
"reset_http")
|
||||
do_reset_http
|
||||
;;
|
||||
"reset_password")
|
||||
do_reset_administrator_password
|
||||
;;
|
||||
"install")
|
||||
do_install
|
||||
;;
|
||||
"upgrade")
|
||||
do_upgrade
|
||||
;;
|
||||
"rm")
|
||||
do_remove
|
||||
;;
|
||||
"start" | "stop" | "restart")
|
||||
config=$(uci get zdinnav.@main[0].config_path 2>/dev/null)
|
||||
cd $config && docker-compose ${ACTION}
|
||||
;;
|
||||
"status")
|
||||
docker ps --all -f 'name=^/zdinnav' --format '{{.State}}'
|
||||
;;
|
||||
"port")
|
||||
docker ps -all -f 'name=^/zdinnav' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
|
||||
;;
|
||||
*)
|
||||
usage
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -5,17 +5,10 @@ services:
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "PORT_VAR:9200"
|
||||
networks:
|
||||
- zdinnavnet
|
||||
network_mode: "bridge"
|
||||
environment:
|
||||
- TZ=Asia/Shanghai
|
||||
volumes:
|
||||
- CONFIG_PATH_VAR/configuration:/app/configuration
|
||||
- CONFIG_PATH_VAR/database:/app/database
|
||||
- CONFIG_PATH_VAR/logs:/app/Logs
|
||||
networks:
|
||||
zdinnavnet:
|
||||
driver: bridge
|
||||
|
||||
volumes:
|
||||
fonts_volume:
|
||||
- CONFIG_PATH_VAR/logs:/app/Logs
|
||||
@@ -1,60 +1,60 @@
|
||||
{
|
||||
"users": [
|
||||
{
|
||||
"nickName": "超级管理员",
|
||||
"account": "ACCOUNT_VAR",
|
||||
"password": "PASSWORD_VAR"
|
||||
}
|
||||
],
|
||||
"searchEngine": [
|
||||
{
|
||||
"title": "百度",
|
||||
"icon": "BaiduSvgIcon",
|
||||
"isDefault": true,
|
||||
"url": "https://www.baidu.com/s?wd={s}",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"title": "必应",
|
||||
"icon": "BingSvgIcon",
|
||||
"isDefault": false,
|
||||
"url": "https://www.bing.com/search?q={s}",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"title": "搜狗",
|
||||
"icon": "SogouSvgIcon",
|
||||
"isDefault": false,
|
||||
"url": "https://www.sogou.com/sogou?query={s}",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"title": "360",
|
||||
"icon": "SoSvgIcon",
|
||||
"isDefault": false,
|
||||
"url": "https://www.so.com/s?q={s}",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"title": "Yandex",
|
||||
"icon": "YandexSvgIcon",
|
||||
"isDefault": false,
|
||||
"url": "https://yandex.com/search/?text={s}",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"title": "Google",
|
||||
"icon": "GoogleSvgIcon",
|
||||
"isDefault": false,
|
||||
"url": "https://www.google.com/search?q={s}",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"title": "DuckDuckGo",
|
||||
"icon": "DuckDuckGoSvgIcon",
|
||||
"isDefault": false,
|
||||
"url": "https://duckduckgo.com/?q={s}",
|
||||
"enable": true
|
||||
}
|
||||
]
|
||||
{
|
||||
"users": [
|
||||
{
|
||||
"nickName": "超级管理员",
|
||||
"account": "ACCOUNT_VAR",
|
||||
"password": "PASSWORD_VAR"
|
||||
}
|
||||
],
|
||||
"searchEngine": [
|
||||
{
|
||||
"title": "百度",
|
||||
"icon": "BaiduSvgIcon",
|
||||
"isDefault": true,
|
||||
"url": "https://www.baidu.com/s?wd={s}",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"title": "必应",
|
||||
"icon": "BingSvgIcon",
|
||||
"isDefault": false,
|
||||
"url": "https://www.bing.com/search?q={s}",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"title": "搜狗",
|
||||
"icon": "SogouSvgIcon",
|
||||
"isDefault": false,
|
||||
"url": "https://www.sogou.com/sogou?query={s}",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"title": "360",
|
||||
"icon": "SoSvgIcon",
|
||||
"isDefault": false,
|
||||
"url": "https://www.so.com/s?q={s}",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"title": "Yandex",
|
||||
"icon": "YandexSvgIcon",
|
||||
"isDefault": false,
|
||||
"url": "https://yandex.com/search/?text={s}",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"title": "Google",
|
||||
"icon": "GoogleSvgIcon",
|
||||
"isDefault": false,
|
||||
"url": "https://www.google.com/search?q={s}",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"title": "DuckDuckGo",
|
||||
"icon": "DuckDuckGoSvgIcon",
|
||||
"isDefault": false,
|
||||
"url": "https://duckduckgo.com/?q={s}",
|
||||
"enable": true
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,35 +1,35 @@
|
||||
{
|
||||
"connectionSettings": {
|
||||
"dbType": "DBTYPE_VAR",
|
||||
"connectionString": "CONNECTIONSTRING_VAR"
|
||||
},
|
||||
"aesSettings": {
|
||||
"key": "EKx3dIvOfzyfxYWRSQyyigoMZ7MHgx/w9jYW8I6eikM=",
|
||||
"iv": "OevLuB2NQXw3bIvHUuscqg=="
|
||||
},
|
||||
"jwtSettings": {
|
||||
"expiresIn": "00:30:00",
|
||||
"expiryTime": "15:00:00",
|
||||
"validIssuer": "ZdinNav",
|
||||
"validAudience": "ZdinNav.Web"
|
||||
},
|
||||
"accountSettings": {
|
||||
"requireDigit": false,
|
||||
"requiredMinLength": 6,
|
||||
"requiredMaxLength": 12,
|
||||
"requireNonAlphanumeric": false,
|
||||
"requireUppercase": false,
|
||||
"requireLowercase": false,
|
||||
"requiredUniqueChars": 3,
|
||||
"requireChinese": false,
|
||||
"requireBlankSpace": false,
|
||||
"lockout": "00:03:00",
|
||||
"maxFailedAccessAttempts": 3
|
||||
},
|
||||
"zdinNavApiSetting": {
|
||||
"swaggerUI": false,
|
||||
"cors": false,
|
||||
"listenport": 9200,
|
||||
"maxFileSize": 6291456
|
||||
}
|
||||
{
|
||||
"connectionSettings": {
|
||||
"dbType": "DBTYPE_VAR",
|
||||
"connectionString": "CONNECTIONSTRING_VAR"
|
||||
},
|
||||
"aesSettings": {
|
||||
"key": "EKx3dIvOfzyfxYWRSQyyigoMZ7MHgx/w9jYW8I6eikM=",
|
||||
"iv": "OevLuB2NQXw3bIvHUuscqg=="
|
||||
},
|
||||
"jwtSettings": {
|
||||
"expiresIn": "00:30:00",
|
||||
"expiryTime": "15.00:00:00",
|
||||
"validIssuer": "ZdinNav",
|
||||
"validAudience": "ZdinNav.Web"
|
||||
},
|
||||
"accountSettings": {
|
||||
"requireDigit": false,
|
||||
"requiredMinLength": 6,
|
||||
"requiredMaxLength": 12,
|
||||
"requireNonAlphanumeric": false,
|
||||
"requireUppercase": false,
|
||||
"requireLowercase": false,
|
||||
"requiredUniqueChars": 3,
|
||||
"requireChinese": false,
|
||||
"requireBlankSpace": false,
|
||||
"lockout": "00:03:00",
|
||||
"maxFailedAccessAttempts": 3
|
||||
},
|
||||
"zdinNavApiSetting": {
|
||||
"swaggerUI": false,
|
||||
"cors": false,
|
||||
"listenport": 9200,
|
||||
"maxFileSize": 6291456
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user