mirror of
https://github.com/kejilion/sh.git
synced 2025-10-03 23:34:20 +08:00
Compare commits
3 commits
6ef2c8d48d
...
0eab38e114
| Author | SHA1 | Date | |
|---|---|---|---|
|
0eab38e114 | ||
|
|
c853578a91 | ||
|
|
c4b4f80234 |
3 changed files with 57 additions and 26 deletions
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/bash
|
||||
sh_v="4.1.2"
|
||||
sh_v="4.1.3"
|
||||
|
||||
|
||||
gl_hui='\e[37m'
|
||||
|
|
@ -213,12 +213,13 @@ install() {
|
|||
|
||||
|
||||
check_disk_space() {
|
||||
local required_gb=$1
|
||||
local path=${2:-/}
|
||||
|
||||
required_gb=$1
|
||||
required_space_mb=$((required_gb * 1024))
|
||||
available_space_mb=$(df -m / | awk 'NR==2 {print $4}')
|
||||
local required_space_mb=$((required_gb * 1024))
|
||||
local available_space_mb=$(df -m "$path" | awk 'NR==2 {print $4}')
|
||||
|
||||
if [ $available_space_mb -lt $required_space_mb ]; then
|
||||
if [ "$available_space_mb" -lt "$required_space_mb" ]; then
|
||||
echo -e "${gl_huang}提示: ${gl_bai}磁盘空间不足！"
|
||||
echo "当前可用空间: $((available_space_mb/1024))G"
|
||||
echo "最小需求空间: ${required_gb}G"
|
||||
|
|
@ -230,6 +231,7 @@ check_disk_space() {
|
|||
}
|
||||
|
||||
|
||||
|
||||
install_dependency() {
|
||||
install wget unzip tar jq grep
|
||||
}
|
||||
|
|
@ -2707,13 +2709,23 @@ clear_host_port_rules() {
|
|||
|
||||
setup_docker_dir() {
|
||||
|
||||
mkdir -p /home/docker/ 2>/dev/null
|
||||
mkdir -p /home /home/docker 2>/dev/null
|
||||
|
||||
if [ -d "/vol1/1000/" ] && [ ! -d "/vol1/1000/docker" ]; then
|
||||
cp -f /home/docker /home/docker1 2>/dev/null
|
||||
rm -rf /home/docker 2>/dev/null
|
||||
mkdir -p /vol1/1000/docker 2>/dev/null
|
||||
ln -s /vol1/1000/docker /home/docker 2>/dev/null
|
||||
fi
|
||||
|
||||
if [ -d "/volume1/" ] && [ ! -d "/volume1/docker" ]; then
|
||||
cp -f /home/docker /home/docker1 2>/dev/null
|
||||
rm -rf /home/docker 2>/dev/null
|
||||
mkdir -p /volume1/docker 2>/dev/null
|
||||
ln -s /volume1/docker /home/docker 2>/dev/null
|
||||
fi
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -2757,7 +2769,8 @@ while true; do
|
|||
read -e -p "请输入你的选择: " choice
|
||||
case $choice in
|
||||
1)
|
||||
check_disk_space $app_size
|
||||
setup_docker_dir
|
||||
check_disk_space $app_size /home/docker
|
||||
read -e -p "输入应用对外服务端口，回车默认使用${docker_port}端口: " app_port
|
||||
local app_port=${app_port:-${docker_port}}
|
||||
local docker_port=$app_port
|
||||
|
|
@ -2765,7 +2778,6 @@ while true; do
|
|||
install jq
|
||||
install_docker
|
||||
docker_rum
|
||||
setup_docker_dir
|
||||
echo "$docker_port" > "/home/docker/${docker_name}_port.conf"
|
||||
|
||||
add_app_id
|
||||
|
|
@ -2870,14 +2882,14 @@ docker_app_plus() {
|
|||
read -e -p "输入你的选择: " choice
|
||||
case $choice in
|
||||
1)
|
||||
check_disk_space $app_size
|
||||
setup_docker_dir
|
||||
check_disk_space $app_size /home/docker
|
||||
read -e -p "输入应用对外服务端口，回车默认使用${docker_port}端口: " app_port
|
||||
local app_port=${app_port:-${docker_port}}
|
||||
local docker_port=$app_port
|
||||
install jq
|
||||
install_docker
|
||||
docker_app_install
|
||||
setup_docker_dir
|
||||
echo "$docker_port" > "/home/docker/${docker_name}_port.conf"
|
||||
|
||||
add_app_id
|
||||
|
|
@ -3142,7 +3154,7 @@ send_stats "安装LDNMP环境"
|
|||
root_use
|
||||
clear
|
||||
echo -e "${gl_huang}LDNMP环境未安装，开始安装LDNMP环境...${gl_bai}"
|
||||
check_disk_space 3
|
||||
check_disk_space 3 /home
|
||||
check_port
|
||||
install_dependency
|
||||
install_docker
|
||||
|
|
@ -3159,7 +3171,7 @@ send_stats "安装nginx环境"
|
|||
root_use
|
||||
clear
|
||||
echo -e "${gl_huang}nginx未安装，开始安装nginx环境...${gl_bai}"
|
||||
check_disk_space 1
|
||||
check_disk_space 1 /home
|
||||
check_port
|
||||
install_dependency
|
||||
install_docker
|
||||
|
|
@ -9189,7 +9201,8 @@ while true; do
|
|||
|
||||
case $choice in
|
||||
1)
|
||||
check_disk_space 2
|
||||
setup_docker_dir
|
||||
check_disk_space 2 /home/docker
|
||||
read -e -p "请设置邮箱域名 例如 mail.yuming.com : " yuming
|
||||
mkdir -p /home/docker
|
||||
echo "$yuming" > /home/docker/mail.txt
|
||||
|
|
|
|||
39
kejilion.sh
39
kejilion.sh
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/bash
|
||||
sh_v="4.1.2"
|
||||
sh_v="4.1.3"
|
||||
|
||||
|
||||
gl_hui='\e[37m'
|
||||
|
|
@ -213,12 +213,13 @@ install() {
|
|||
|
||||
|
||||
check_disk_space() {
|
||||
local required_gb=$1
|
||||
local path=${2:-/}
|
||||
|
||||
required_gb=$1
|
||||
required_space_mb=$((required_gb * 1024))
|
||||
available_space_mb=$(df -m / | awk 'NR==2 {print $4}')
|
||||
local required_space_mb=$((required_gb * 1024))
|
||||
local available_space_mb=$(df -m "$path" | awk 'NR==2 {print $4}')
|
||||
|
||||
if [ $available_space_mb -lt $required_space_mb ]; then
|
||||
if [ "$available_space_mb" -lt "$required_space_mb" ]; then
|
||||
echo -e "${gl_huang}提示: ${gl_bai}磁盘空间不足！"
|
||||
echo "当前可用空间: $((available_space_mb/1024))G"
|
||||
echo "最小需求空间: ${required_gb}G"
|
||||
|
|
@ -230,6 +231,7 @@ check_disk_space() {
|
|||
}
|
||||
|
||||
|
||||
|
||||
install_dependency() {
|
||||
install wget unzip tar jq grep
|
||||
}
|
||||
|
|
@ -2707,13 +2709,23 @@ clear_host_port_rules() {
|
|||
|
||||
setup_docker_dir() {
|
||||
|
||||
mkdir -p /home/docker/ 2>/dev/null
|
||||
mkdir -p /home /home/docker 2>/dev/null
|
||||
|
||||
if [ -d "/vol1/1000/" ] && [ ! -d "/vol1/1000/docker" ]; then
|
||||
cp -f /home/docker /home/docker1 2>/dev/null
|
||||
rm -rf /home/docker 2>/dev/null
|
||||
mkdir -p /vol1/1000/docker 2>/dev/null
|
||||
ln -s /vol1/1000/docker /home/docker 2>/dev/null
|
||||
fi
|
||||
|
||||
if [ -d "/volume1/" ] && [ ! -d "/volume1/docker" ]; then
|
||||
cp -f /home/docker /home/docker1 2>/dev/null
|
||||
rm -rf /home/docker 2>/dev/null
|
||||
mkdir -p /volume1/docker 2>/dev/null
|
||||
ln -s /volume1/docker /home/docker 2>/dev/null
|
||||
fi
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -2757,7 +2769,8 @@ while true; do
|
|||
read -e -p "请输入你的选择: " choice
|
||||
case $choice in
|
||||
1)
|
||||
check_disk_space $app_size
|
||||
setup_docker_dir
|
||||
check_disk_space $app_size /home/docker
|
||||
read -e -p "输入应用对外服务端口，回车默认使用${docker_port}端口: " app_port
|
||||
local app_port=${app_port:-${docker_port}}
|
||||
local docker_port=$app_port
|
||||
|
|
@ -2765,7 +2778,6 @@ while true; do
|
|||
install jq
|
||||
install_docker
|
||||
docker_rum
|
||||
setup_docker_dir
|
||||
echo "$docker_port" > "/home/docker/${docker_name}_port.conf"
|
||||
|
||||
add_app_id
|
||||
|
|
@ -2870,14 +2882,14 @@ docker_app_plus() {
|
|||
read -e -p "输入你的选择: " choice
|
||||
case $choice in
|
||||
1)
|
||||
check_disk_space $app_size
|
||||
setup_docker_dir
|
||||
check_disk_space $app_size /home/docker
|
||||
read -e -p "输入应用对外服务端口，回车默认使用${docker_port}端口: " app_port
|
||||
local app_port=${app_port:-${docker_port}}
|
||||
local docker_port=$app_port
|
||||
install jq
|
||||
install_docker
|
||||
docker_app_install
|
||||
setup_docker_dir
|
||||
echo "$docker_port" > "/home/docker/${docker_name}_port.conf"
|
||||
|
||||
add_app_id
|
||||
|
|
@ -3142,7 +3154,7 @@ send_stats "安装LDNMP环境"
|
|||
root_use
|
||||
clear
|
||||
echo -e "${gl_huang}LDNMP环境未安装，开始安装LDNMP环境...${gl_bai}"
|
||||
check_disk_space 3
|
||||
check_disk_space 3 /home
|
||||
check_port
|
||||
install_dependency
|
||||
install_docker
|
||||
|
|
@ -3159,7 +3171,7 @@ send_stats "安装nginx环境"
|
|||
root_use
|
||||
clear
|
||||
echo -e "${gl_huang}nginx未安装，开始安装nginx环境...${gl_bai}"
|
||||
check_disk_space 1
|
||||
check_disk_space 1 /home
|
||||
check_port
|
||||
install_dependency
|
||||
install_docker
|
||||
|
|
@ -9189,7 +9201,8 @@ while true; do
|
|||
|
||||
case $choice in
|
||||
1)
|
||||
check_disk_space 2
|
||||
setup_docker_dir
|
||||
check_disk_space 2 /home/docker
|
||||
read -e -p "请设置邮箱域名 例如 mail.yuming.com : " yuming
|
||||
mkdir -p /home/docker
|
||||
echo "$yuming" > /home/docker/mail.txt
|
||||
|
|
|
|||
|
|
@ -1292,3 +1292,8 @@ docker管理增加全局备份还原迁移功能。
|
|||
应用市场新增WireGuard异地隧道组网工具的安装及使用。
|
||||
系统工具中一键重装系统新增Windows sreve 2025的安装。
|
||||
------------------------
|
||||
2025-09-03 v4.1.3
|
||||
应用市场尝试适配群晖系统文件结构。
|
||||
应用安装时的存储空间检测进行优化，可以更精准检测应用目录大小。
|
||||
------------------------
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue
