mirror of
https://github.com/monlor/MIXBOX-ARCHIVE.git
synced 2026-03-10 23:41:27 +00:00
2020-03-05 18:31:48
This commit is contained in:
47
.github/workflows/main.yml
vendored
47
.github/workflows/main.yml
vendored
@@ -1,41 +1,11 @@
|
||||
name: CI
|
||||
|
||||
# on:
|
||||
# push:
|
||||
# branchs:
|
||||
# - 'test'
|
||||
# - 'master'
|
||||
# pull_request:
|
||||
# branchs:
|
||||
# - 'test'
|
||||
# - 'master'
|
||||
# paths:
|
||||
# - 'apps/**'
|
||||
# - 'appsbin/**'
|
||||
# - 'temp/**'
|
||||
# on: [push, pull_request]
|
||||
on:
|
||||
push:
|
||||
paths-ignore:
|
||||
- 'README.md'
|
||||
- 'tools'
|
||||
- '.github'
|
||||
branchs:
|
||||
- 'test'
|
||||
- 'master'
|
||||
pull_request:
|
||||
paths-ignore:
|
||||
- 'README.md'
|
||||
- 'tools'
|
||||
- '.github'
|
||||
branchs:
|
||||
- 'test'
|
||||
- 'master'
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
|
||||
runs-on: macos-latest
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
@@ -53,10 +23,8 @@ jobs:
|
||||
cp -rf install.sh mbfiles/
|
||||
- name: Push changes
|
||||
env:
|
||||
GH_REF: github.com/monlor/mbfiles
|
||||
GE_REF: gitee.com/monlor/mbfiles
|
||||
GH_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||
GE_TOKEN: ${{ secrets.GE_TOKEN }}
|
||||
GH_REF: ${{ secrets.GH_REF }}
|
||||
CO_REF: ${{ secrets.CO_REF }}
|
||||
BRANCH_NAME: $(cd .. && git branch | awk '$1 == "*"{print $2}')
|
||||
run: |
|
||||
cd mbfiles/
|
||||
@@ -65,8 +33,5 @@ jobs:
|
||||
git config --local user.name "monlor"
|
||||
git add .
|
||||
git commit -m "$(TZ='Asia/Shanghai' date "+%Y-%m-%d %H:%M:%S")" -a
|
||||
eval "git branch | grep -q "${BRANCH_NAME}" || git checkout -b "${BRANCH_NAME}""
|
||||
eval "git push "https://${GH_TOKEN}@${GH_REF}" "${BRANCH_NAME}":"${BRANCH_NAME}" -f"
|
||||
echo "${GE_TOKEN}" > /root/.ssh/id_rsa
|
||||
chmod 600 /root/.ssh/id_rsa
|
||||
eval "git push "https://${GE_REF}" "${BRANCH_NAME}":"${BRANCH_NAME}" -f"
|
||||
eval "git push "${GH_REF}" master:"${BRANCH_NAME}" -f"
|
||||
eval "git push "${CO_REF}" master:"${BRANCH_NAME}" -f"
|
||||
55
.github/workflows/master.yml
vendored
Normal file
55
.github/workflows/master.yml
vendored
Normal file
@@ -0,0 +1,55 @@
|
||||
name: Master-CI
|
||||
|
||||
on:
|
||||
push:
|
||||
paths-ignore:
|
||||
- 'README.md'
|
||||
branches:
|
||||
- 'master1'
|
||||
pull_request:
|
||||
paths-ignore:
|
||||
- 'README.md'
|
||||
branches:
|
||||
- 'master1'
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@master
|
||||
|
||||
- name: Pack files
|
||||
run: |
|
||||
mkdir appstore/
|
||||
mkdir mbfiles/
|
||||
bash ./tools/gitsync.sh pack all
|
||||
cp -rf appsbin/ mbfiles/appsbin/
|
||||
cp -rf appstore/ mbfiles/appstore/
|
||||
cp -rf temp/ mbfiles/temp/
|
||||
cp -rf applist.txt mbfiles/
|
||||
cp -rf install.sh mbfiles/
|
||||
|
||||
- name: Push to Github
|
||||
env:
|
||||
GH_REF: github.com/monlor/mbfiles
|
||||
GH_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||
run: |
|
||||
cd mbfiles/
|
||||
git init
|
||||
git config --local user.email "monlor@qq.com"
|
||||
git config --local user.name "monlor"
|
||||
git add .
|
||||
git commit -m "$(TZ='Asia/Shanghai' date "+%Y-%m-%d %H:%M:%S")" -a
|
||||
git push "https://${GH_TOKEN}@${GH_REF}" master:master -f
|
||||
|
||||
- name: Push to Gitee
|
||||
uses: s0/git-publish-subdir-action@master
|
||||
env:
|
||||
REPO: git@gitee.com:monlor/mbfiles.git
|
||||
BRANCH: master
|
||||
FOLDER: mbfiles
|
||||
SSH_PRIVATE_KEY: ${{ secrets.GE_TOKEN }}
|
||||
KNOWN_HOSTS_FILE: temp/known_hosts # Needed if target repo is not on github.com
|
||||
|
||||
|
||||
55
.github/workflows/test.yaml
vendored
Normal file
55
.github/workflows/test.yaml
vendored
Normal file
@@ -0,0 +1,55 @@
|
||||
name: Test-CI
|
||||
|
||||
on:
|
||||
push:
|
||||
paths-ignore:
|
||||
- 'README.md'
|
||||
branches:
|
||||
- 'test1'
|
||||
pull_request:
|
||||
paths-ignore:
|
||||
- 'README.md'
|
||||
branches:
|
||||
- 'test1'
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@master
|
||||
|
||||
- name: Pack files
|
||||
run: |
|
||||
mkdir appstore/
|
||||
mkdir mbfiles/
|
||||
bash ./tools/gitsync.sh pack all
|
||||
cp -rf appsbin/ mbfiles/appsbin/
|
||||
cp -rf appstore/ mbfiles/appstore/
|
||||
cp -rf temp/ mbfiles/temp/
|
||||
cp -rf applist.txt mbfiles/
|
||||
cp -rf install.sh mbfiles/
|
||||
|
||||
- name: Push to Github
|
||||
env:
|
||||
GH_REF: github.com/monlor/mbfiles
|
||||
GH_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||
run: |
|
||||
cd mbfiles/
|
||||
git init
|
||||
git config --local user.email "monlor@qq.com"
|
||||
git config --local user.name "monlor"
|
||||
git add .
|
||||
git commit -m "$(TZ='Asia/Shanghai' date "+%Y-%m-%d %H:%M:%S")" -a
|
||||
git push "https://${GH_TOKEN}@${GH_REF}" master:test -f
|
||||
|
||||
- name: Push to Gitee
|
||||
uses: s0/git-publish-subdir-action@master
|
||||
env:
|
||||
REPO: git@gitee.com:monlor/mbfiles.git
|
||||
BRANCH: test
|
||||
FOLDER: mbfiles
|
||||
SSH_PRIVATE_KEY: ${{ secrets.GE_TOKEN }}
|
||||
KNOWN_HOSTS_FILE: temp/known_hosts # Needed if target repo is not on github.com
|
||||
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
#------------------【DMS】--------------------
|
||||
dms() {
|
||||
|
||||
eval `mbdb export dms`
|
||||
source "$(mbdb get mixbox.main.path)"/bin/base
|
||||
echo "********* $service ***********"
|
||||
echo "[${appinfo}]"
|
||||
readsh "启动${appname}服务[1/0] " "enable" "1"
|
||||
if [ "$enable" == '1' ]; then
|
||||
# Scripts Here
|
||||
readsh "请输入${appname}媒体目录" "path" "${mbdisk}"
|
||||
readsh "请输入${appname}媒体服务器名称" "servername" "mixbox-dms"
|
||||
# readsh "请输入${appname}外网访问配置[1/0]" "openport" "0"
|
||||
readsh "重启${appname}服务[1/0] " "res" "1"
|
||||
[ "$res" = '1' -o -z "$res" ] && ${mbroot}/apps/${appname}/scripts/${appname}.sh restart
|
||||
else
|
||||
${mbroot}/apps/${appname}/scripts/${appname}.sh stop
|
||||
fi
|
||||
eval `mbdb export dms`
|
||||
source "$(mbdb get mixbox.main.path)"/bin/base
|
||||
echo "********* $service ***********"
|
||||
echo "[${appinfo}]"
|
||||
readsh "启动${appname}服务[1/0] " "enable" "1"
|
||||
if [ "$enable" == '1' ]; then
|
||||
# Scripts Here
|
||||
readsh "请输入${appname}媒体目录" "path" "${mbdisk}"
|
||||
readsh "请输入${appname}媒体服务器名称" "servername" "mixbox-dms"
|
||||
# readsh "请输入${appname}外网访问配置[1/0]" "openport" "0"
|
||||
readsh "重启${appname}服务[1/0] " "res" "1"
|
||||
[ "$res" = '1' -o -z "$res" ] && ${mbroot}/apps/${appname}/scripts/${appname}.sh restart
|
||||
else
|
||||
${mbroot}/apps/${appname}/scripts/${appname}.sh stop
|
||||
fi
|
||||
|
||||
}
|
||||
#------------------【DMS】--------------------
|
||||
|
||||
@@ -6,63 +6,63 @@ port=""
|
||||
|
||||
start() {
|
||||
|
||||
[ -n "$(pidof ${appname})" ] && logsh "【$service】" "${appname}已经在运行!" && exit 1
|
||||
logsh "【$service】" "正在启动${appname}服务... "
|
||||
cru a "${appname}" "0 6 * * * ${mbroot}/apps/${appname}/scripts/${appname}.sh restart"
|
||||
# Scripts Here
|
||||
[ -z "$path" ] && echo "媒体目录不能为空!" && exit 1
|
||||
# open_port
|
||||
# write_firewall_start
|
||||
daemon ${mbroot}/apps/${appname}/bin/${appname} -path "${path}" -friendlyName "${servername}" -http ":11338" -fFprobeCachePath "${mbdisk}/.dms-ffprobe-cache"
|
||||
if [ $? -ne 0 ]; then
|
||||
logsh "【$service】" "启动${appname}服务失败!" && end
|
||||
else
|
||||
logsh "【$service】" "启动${appname}服务完成!"
|
||||
# logsh "【$service】" "请在浏览器打开地址:http://$lanip:$port"
|
||||
fi
|
||||
|
||||
[ -n "$(pidof ${appname})" ] && logsh "【$service】" "${appname}已经在运行!" && exit 1
|
||||
logsh "【$service】" "正在启动${appname}服务... "
|
||||
cru a "${appname}" "0 6 * * * ${mbroot}/apps/${appname}/scripts/${appname}.sh restart"
|
||||
# Scripts Here
|
||||
[ -z "$path" ] && echo "媒体目录不能为空!" && exit 1
|
||||
# open_port
|
||||
# write_firewall_start
|
||||
daemon ${mbroot}/apps/${appname}/bin/${appname} -path "${path}" -friendlyName "${servername}" -http ":11338" -fFprobeCachePath "${mbdisk}/.dms-ffprobe-cache"
|
||||
if [ $? -ne 0 ]; then
|
||||
logsh "【$service】" "启动${appname}服务失败!" && end
|
||||
else
|
||||
logsh "【$service】" "启动${appname}服务完成!"
|
||||
# logsh "【$service】" "请在浏览器打开地址:http://$lanip:$port"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
stop() {
|
||||
|
||||
logsh "【$service】" "正在停止${appname}服务... "
|
||||
[ "$enable" == '0' ] && destroy
|
||||
# close_port
|
||||
# remove_firewall_start
|
||||
killall -9 ${appname} &> /dev/null
|
||||
logsh "【$service】" "正在停止${appname}服务... "
|
||||
[ "$enable" == '0' ] && destroy
|
||||
# close_port
|
||||
# remove_firewall_start
|
||||
killall -9 ${appname} &> /dev/null
|
||||
|
||||
}
|
||||
|
||||
destroy() {
|
||||
|
||||
# End app, Scripts here
|
||||
cru d "${appname}"
|
||||
return
|
||||
|
||||
# End app, Scripts here
|
||||
cru d "${appname}"
|
||||
return
|
||||
|
||||
}
|
||||
|
||||
end() {
|
||||
|
||||
mbdb set ${appname}.main.enable=0
|
||||
stop && exit 1
|
||||
mbdb set ${appname}.main.enable=0
|
||||
stop && exit 1
|
||||
|
||||
}
|
||||
|
||||
status() {
|
||||
|
||||
if [ -n "$(pidof ${appname})" ]; then
|
||||
status="运行中|1"
|
||||
else
|
||||
status="未运行|0"
|
||||
fi
|
||||
mbdb set ${appname}.main.status="$status"
|
||||
if [ -n "$(pidof ${appname})" ]; then
|
||||
status="运行中|1"
|
||||
else
|
||||
status="未运行|0"
|
||||
fi
|
||||
mbdb set ${appname}.main.status="$status"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start) start ;;
|
||||
stop) stop ;;
|
||||
restart) stop; start ;;
|
||||
reload) close_port && open_port ;;
|
||||
status) status ;;
|
||||
start) start ;;
|
||||
stop) stop ;;
|
||||
restart) stop; start ;;
|
||||
reload) close_port && open_port ;;
|
||||
status) status ;;
|
||||
esac
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
export PATH=$PATH:/etc/mixbox/bin
|
||||
|
||||
mburl_coding="https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/master"
|
||||
mburl_github="https://cdn.jsdelivr.net/gh/monlor/mbfiles"
|
||||
mburl_github="https://raw.githubusercontent.com/monlor/MIXBOX/master"
|
||||
# mburl_test="https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/test"
|
||||
mburl=$(mbdb get mixbox.main.url) || mburl="$mburl_coding"
|
||||
mbroot=$(mbdb get mixbox.main.path)
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
#------------------【NPC】--------------------
|
||||
npc() {
|
||||
|
||||
eval `mbdb export npc`
|
||||
source "$(mbdb get mixbox.main.path)"/bin/base
|
||||
echo "********* $service ***********"
|
||||
echo "[${appinfo}]"
|
||||
readsh "启动${appname}服务[1/0] " "enable" "1"
|
||||
if [ "$enable" == '1' ]; then
|
||||
# Scripts Here
|
||||
readsh "请输入npc连接命令:" "connect_cmd"
|
||||
eval `mbdb export npc`
|
||||
source "$(mbdb get mixbox.main.path)"/bin/base
|
||||
echo "********* $service ***********"
|
||||
echo "[${appinfo}]"
|
||||
readsh "启动${appname}服务[1/0] " "enable" "1"
|
||||
if [ "$enable" == '1' ]; then
|
||||
# Scripts Here
|
||||
readsh "请输入npc连接命令:" "connect_cmd"
|
||||
|
||||
# readsh "请输入${appname}外网访问配置[1/0]" "openport" "0"
|
||||
readsh "重启${appname}服务[1/0] " "res" "1"
|
||||
[ "$res" = '1' -o -z "$res" ] && ${mbroot}/apps/${appname}/scripts/${appname}.sh restart
|
||||
else
|
||||
${mbroot}/apps/${appname}/scripts/${appname}.sh stop
|
||||
fi
|
||||
# readsh "请输入${appname}外网访问配置[1/0]" "openport" "0"
|
||||
readsh "重启${appname}服务[1/0] " "res" "1"
|
||||
[ "$res" = '1' -o -z "$res" ] && ${mbroot}/apps/${appname}/scripts/${appname}.sh restart
|
||||
else
|
||||
${mbroot}/apps/${appname}/scripts/${appname}.sh stop
|
||||
fi
|
||||
|
||||
}
|
||||
#------------------【NPC】--------------------
|
||||
|
||||
@@ -6,66 +6,66 @@ port=""
|
||||
|
||||
start() {
|
||||
|
||||
[ -n "$(pidof ${appname})" ] && logsh "【$service】" "${appname}已经在运行!" && exit 1
|
||||
logsh "【$service】" "正在启动${appname}服务... "
|
||||
# cru a "${appname}" "0 6 * * * ${mbroot}/apps/${appname}/scripts/${appname}.sh restart"
|
||||
# Scripts Here
|
||||
[ -n "$(pidof ${appname})" ] && logsh "【$service】" "${appname}已经在运行!" && exit 1
|
||||
logsh "【$service】" "正在启动${appname}服务... "
|
||||
# cru a "${appname}" "0 6 * * * ${mbroot}/apps/${appname}/scripts/${appname}.sh restart"
|
||||
# Scripts Here
|
||||
|
||||
# open_port
|
||||
# write_firewall_start
|
||||
[ -z "${connect_cmd}" ] && echo "连接命令未设置!" && end
|
||||
connect_cmd="$(echo "$connect_cmd" | sed -e "s#^\./#${mbroot}/apps/${appname}/bin/#")"
|
||||
# 这里有参数,所以不加引号
|
||||
daemon ${connect_cmd}
|
||||
if [ $? -ne 0 ]; then
|
||||
logsh "【$service】" "启动${appname}服务失败!" && end
|
||||
else
|
||||
logsh "【$service】" "启动${appname}服务完成!"
|
||||
# logsh "【$service】" "请在浏览器打开地址:http://$lanip:$port"
|
||||
fi
|
||||
|
||||
# open_port
|
||||
# write_firewall_start
|
||||
[ -z "${connect_cmd}" ] && echo "连接命令未设置!" && end
|
||||
connect_cmd="$(echo "$connect_cmd" | sed -e "s#^\./#${mbroot}/apps/${appname}/bin/#")"
|
||||
# 这里有参数,所以不加引号
|
||||
daemon ${connect_cmd}
|
||||
if [ $? -ne 0 ]; then
|
||||
logsh "【$service】" "启动${appname}服务失败!" && end
|
||||
else
|
||||
logsh "【$service】" "启动${appname}服务完成!"
|
||||
# logsh "【$service】" "请在浏览器打开地址:http://$lanip:$port"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
stop() {
|
||||
|
||||
logsh "【$service】" "正在停止${appname}服务... "
|
||||
[ "$enable" == '0' ] && destroy
|
||||
# close_port
|
||||
# remove_firewall_start
|
||||
killall -9 ${appname} &> /dev/null
|
||||
logsh "【$service】" "正在停止${appname}服务... "
|
||||
[ "$enable" == '0' ] && destroy
|
||||
# close_port
|
||||
# remove_firewall_start
|
||||
killall -9 ${appname} &> /dev/null
|
||||
|
||||
}
|
||||
|
||||
destroy() {
|
||||
|
||||
# End app, Scripts here
|
||||
# cru d "${appname}"
|
||||
return
|
||||
|
||||
# End app, Scripts here
|
||||
# cru d "${appname}"
|
||||
return
|
||||
|
||||
}
|
||||
|
||||
end() {
|
||||
|
||||
mbdb set ${appname}.main.enable=0
|
||||
stop && exit 1
|
||||
mbdb set ${appname}.main.enable=0
|
||||
stop && exit 1
|
||||
|
||||
}
|
||||
|
||||
status() {
|
||||
|
||||
if [ -n "$(pidof ${appname})" ]; then
|
||||
status="运行中|1"
|
||||
else
|
||||
status="未运行|0"
|
||||
fi
|
||||
mbdb set ${appname}.main.status="$status"
|
||||
if [ -n "$(pidof ${appname})" ]; then
|
||||
status="运行中|1"
|
||||
else
|
||||
status="未运行|0"
|
||||
fi
|
||||
mbdb set ${appname}.main.status="$status"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start) start ;;
|
||||
stop) stop ;;
|
||||
restart) stop; start ;;
|
||||
reload) close_port && open_port ;;
|
||||
status) status ;;
|
||||
start) start ;;
|
||||
stop) stop ;;
|
||||
restart) stop; start ;;
|
||||
reload) close_port && open_port ;;
|
||||
status) status ;;
|
||||
esac
|
||||
|
||||
|
||||
@@ -7,104 +7,104 @@ SETTING_FILE="${mbroot}/apps/${appname}/bin/cookie.txt"
|
||||
|
||||
generate_cookie_conf() {
|
||||
|
||||
cp -f ${mbroot}/apps/${appname}/config/cookie_template.txt ${SETTING_FILE}
|
||||
cp -f ${mbroot}/apps/${appname}/config/cookie_template.txt ${SETTING_FILE}
|
||||
|
||||
local qiandao_setting=""
|
||||
local qiandao_enable=""
|
||||
local qiandao_setting=""
|
||||
local qiandao_enable=""
|
||||
|
||||
echo "${qiandao_support}" | tr ' ' '\n' | while read line; do
|
||||
test -z "${line}" && continue
|
||||
qiandao_setting="$(parse_str qiandao_${line}_setting)"
|
||||
qiandao_enable="$(parse_str qiandao_${line})"
|
||||
# 该签到网站未启用签到程序时,将cookie置为空
|
||||
[ "${qiandao_enable}" != "1" ] && qiandao_setting="" || qiandao_setting="$(base_decode "${qiandao_setting}")"
|
||||
sed -i "s/##${line}_cookie##/${qiandao_setting}/" ${SETTING_FILE}
|
||||
done
|
||||
echo "${qiandao_support}" | tr ' ' '\n' | while read line; do
|
||||
test -z "${line}" && continue
|
||||
qiandao_setting="$(parse_str qiandao_${line}_setting)"
|
||||
qiandao_enable="$(parse_str qiandao_${line})"
|
||||
# 该签到网站未启用签到程序时,将cookie置为空
|
||||
[ "${qiandao_enable}" != "1" ] && qiandao_setting="" || qiandao_setting="$(base_decode "${qiandao_setting}")"
|
||||
sed -i "s/##${line}_cookie##/${qiandao_setting}/" ${SETTING_FILE}
|
||||
done
|
||||
|
||||
}
|
||||
|
||||
add_cron() {
|
||||
|
||||
logsh "【$service】" "添加签到定时任务,每天$qiandao_time点自动签到..."
|
||||
cru a ${appname} "1 $qiandao_time * * * ${mbroot}/apps/${appname}/scripts/${appname}.sh restart"
|
||||
logsh "【$service】" "添加签到定时任务,每天$qiandao_time点自动签到..."
|
||||
cru a ${appname} "1 $qiandao_time * * * ${mbroot}/apps/${appname}/scripts/${appname}.sh restart"
|
||||
|
||||
}
|
||||
|
||||
del_cron() {
|
||||
|
||||
logsh "【$service】" "删除签到定时任务!"
|
||||
cru d ${appname}
|
||||
logsh "【$service】" "删除签到定时任务!"
|
||||
cru d ${appname}
|
||||
|
||||
}
|
||||
|
||||
start() {
|
||||
|
||||
[ -n "$(pidof ${appname})" ] && logsh "【$service】" "${appname}已经在运行!" && exit 1
|
||||
logsh "【$service】" "正在启动${appname}服务... "
|
||||
# Scripts Here
|
||||
generate_cookie_conf
|
||||
add_cron
|
||||
# open_port
|
||||
# write_firewall_start
|
||||
if [ "$qiandao_action" == '2' ]; then
|
||||
i=4
|
||||
while(true)
|
||||
do
|
||||
echo "-------------------------------"
|
||||
cd ${mbroot}/apps/${appname}/bin && ./${appname} 2>&1 | tee ${mbroot}/var/log/${appname}.log
|
||||
echo "-------------------------------"
|
||||
if [ -z "$(cat ${mbroot}/var/log/${appname}.log | grep panic)" ]; then
|
||||
break
|
||||
else
|
||||
logsh "【$service】" "出错了,1秒后尝试重新启动..."
|
||||
sleep 1
|
||||
fi
|
||||
let i=$i-1
|
||||
[ "$i" -eq 0 ] && logsh "【$service】" "启动${appname}服务失败!" && exit 1
|
||||
done
|
||||
else
|
||||
mbdb set $appname.main.qiandao_action='2'
|
||||
|
||||
fi
|
||||
|
||||
logsh "【$service】" "启动${appname}服务完成!"
|
||||
status
|
||||
|
||||
[ -n "$(pidof ${appname})" ] && logsh "【$service】" "${appname}已经在运行!" && exit 1
|
||||
logsh "【$service】" "正在启动${appname}服务... "
|
||||
# Scripts Here
|
||||
generate_cookie_conf
|
||||
add_cron
|
||||
# open_port
|
||||
# write_firewall_start
|
||||
if [ "$qiandao_action" == '2' ]; then
|
||||
i=4
|
||||
while(true)
|
||||
do
|
||||
echo "-------------------------------"
|
||||
cd ${mbroot}/apps/${appname}/bin && ./${appname} 2>&1 | tee ${mbroot}/var/log/${appname}.log
|
||||
echo "-------------------------------"
|
||||
if [ -z "$(cat ${mbroot}/var/log/${appname}.log | grep panic)" ]; then
|
||||
break
|
||||
else
|
||||
logsh "【$service】" "出错了,1秒后尝试重新启动..."
|
||||
sleep 1
|
||||
fi
|
||||
let i=$i-1
|
||||
[ "$i" -eq 0 ] && logsh "【$service】" "启动${appname}服务失败!" && exit 1
|
||||
done
|
||||
else
|
||||
mbdb set $appname.main.qiandao_action='2'
|
||||
|
||||
fi
|
||||
|
||||
logsh "【$service】" "启动${appname}服务完成!"
|
||||
status
|
||||
|
||||
}
|
||||
|
||||
stop() {
|
||||
|
||||
logsh "【$service】" "正在停止${appname}服务... "
|
||||
rm -rf $SETTING_FILE
|
||||
rm -rf ${mbroot}/apps/${appname}/bin/cookie.txt
|
||||
# killall -9 ${appname} &> /dev/null
|
||||
[ "$enable" == '0' ] && destroy
|
||||
logsh "【$service】" "正在停止${appname}服务... "
|
||||
rm -rf $SETTING_FILE
|
||||
rm -rf ${mbroot}/apps/${appname}/bin/cookie.txt
|
||||
# killall -9 ${appname} &> /dev/null
|
||||
[ "$enable" == '0' ] && destroy
|
||||
|
||||
}
|
||||
|
||||
destroy() {
|
||||
|
||||
# End app, Scripts here
|
||||
del_cron
|
||||
return
|
||||
|
||||
# End app, Scripts here
|
||||
del_cron
|
||||
return
|
||||
|
||||
}
|
||||
|
||||
status() {
|
||||
|
||||
if [ -n "$(cru l | grep ${appname})" -a -f ${mbroot}/apps/${appname}/bin/cookie.txt ]; then
|
||||
status="运行中,每天$qiandao_time点自动签到|1"
|
||||
else
|
||||
status="未运行|0"
|
||||
fi
|
||||
mbdb set $appname.main.status="$status"
|
||||
if [ -n "$(cru l | grep ${appname})" -a -f ${mbroot}/apps/${appname}/bin/cookie.txt ]; then
|
||||
status="运行中,每天$qiandao_time点自动签到|1"
|
||||
else
|
||||
status="未运行|0"
|
||||
fi
|
||||
mbdb set $appname.main.status="$status"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start) start ;;
|
||||
stop) stop ;;
|
||||
restart) stop; start ;;
|
||||
reload) stop; start ;;
|
||||
status) status ;;
|
||||
start) start ;;
|
||||
stop) stop ;;
|
||||
restart) stop; start ;;
|
||||
reload) stop; start ;;
|
||||
status) status ;;
|
||||
esac
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -17,7 +17,7 @@ logsh "【Tools】" "请按任意键安装工具箱(Ctrl + C 退出)."
|
||||
read answer
|
||||
#check root
|
||||
# [ "$USER" != "root" ] && logsh "【Tools】" "请使用root用户安装工具箱!" && exit 1
|
||||
mburl="https://gitee.com/monlor/mbfiles/raw/master"
|
||||
mburl="https://gitee.com/monlor/mbfiles/raw/master"
|
||||
mbtmp="/tmp/mbtmp"
|
||||
[ ! -d "${mbtmp}" ] && mkdir -p ${mbtmp}
|
||||
model=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]')
|
||||
@@ -66,12 +66,12 @@ chmod -R +x ${mbroot}/*
|
||||
if uname -v | grep "Ubuntu" &> /dev/null; then
|
||||
logsh "【Tools】" "正在切换默认Shell为bash,请输入no!"
|
||||
dpkg-reconfigure dash
|
||||
fi
|
||||
fi
|
||||
|
||||
logsh "【Tools】" "初始化工具箱配置信息..."
|
||||
mkdir ${mbroot}/mbdb
|
||||
mkdir ${mbroot}/var
|
||||
mkdir ${mbroot}/var/log
|
||||
mkdir ${mbroot}/var/log
|
||||
mkdir ${mbroot}/var/run
|
||||
touch ${mbroot}/config/applist.txt #初始化插件列表
|
||||
cat ${mbroot}/config/mixbox.uci| while read line; do
|
||||
|
||||
6
temp/known_hosts
Normal file
6
temp/known_hosts
Normal file
@@ -0,0 +1,6 @@
|
||||
# gitee.com:22 SSH-2.0-Basalt-3.0.0
|
||||
gitee.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMuEoYdx6to5oxR60IWj8uoe1aI0X1fKOHWOtLqTg1tsLT1iFwXV5JmFjU46EzeMBV/6EmI1uaRI6HiEPtPtJHE=
|
||||
# gitee.com:22 SSH-2.0-Basalt-1.2.12
|
||||
gitee.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMzG3r+88lWSDK9fyjcZmYsWGDBDmGoAasKMAmjoFloGt9HRQX2Qp4f9FY2XK/hsHYinvoh5Xytl9iaUNUWMfYR8q6VEMtOO87DgoAFcfKZHt0/nbAg9RoNTKYt6v8tPwYpr7N0JP/01nE4LFsNDnstr6H0bXSAzbKWCETLZfdPV4l2uSpRn3bU0ugoZ0aSKz5Dc/IloBfGCTvkSsxUydMRd/Chpjt6VxncDbp+Fa6pzsseK8OQzrg6Fgc5783EN3EQqZ2skqyCwExtx95BJlfx1B3luZnWfpkwNDnrZRT/Qx0OrWqyf0q6f9uQr+UG1S8qDcUn3e/9onq3rwBri8/
|
||||
# gitee.com:22 SSH-2.0-Basalt-3.0.0
|
||||
gitee.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEKxHSJ7084RmkJ4YdEi5tngynE8aZe2uEoVVsB/OvYN
|
||||
100
tools/newapp.sh
100
tools/newapp.sh
@@ -28,20 +28,20 @@ cat > ${appname}/config/mixbox.conf <<EOF
|
||||
#------------------【$2】--------------------
|
||||
${appname}() {
|
||||
|
||||
eval \`mbdb export ${appname}\`
|
||||
source "\$(mbdb get mixbox.main.path)"/bin/base
|
||||
echo "********* \$service ***********"
|
||||
echo "[\${appinfo}]"
|
||||
readsh "启动\${appname}服务[1/0] " "enable" "1"
|
||||
if [ "\$enable" == '1' ]; then
|
||||
# Scripts Here
|
||||
|
||||
# readsh "请输入\${appname}外网访问配置[1/0]" "openport" "0"
|
||||
readsh "重启\${appname}服务[1/0] " "res" "1"
|
||||
[ "\$res" = '1' -o -z "\$res" ] && \${mbroot}/apps/\${appname}/scripts/\${appname}.sh restart
|
||||
else
|
||||
\${mbroot}/apps/\${appname}/scripts/\${appname}.sh stop
|
||||
fi
|
||||
eval \`mbdb export ${appname}\`
|
||||
source "\$(mbdb get mixbox.main.path)"/bin/base
|
||||
echo "********* \$service ***********"
|
||||
echo "[\${appinfo}]"
|
||||
readsh "启动\${appname}服务[1/0] " "enable" "1"
|
||||
if [ "\$enable" == '1' ]; then
|
||||
# Scripts Here
|
||||
|
||||
# readsh "请输入\${appname}外网访问配置[1/0]" "openport" "0"
|
||||
readsh "重启\${appname}服务[1/0] " "res" "1"
|
||||
[ "\$res" = '1' -o -z "\$res" ] && \${mbroot}/apps/\${appname}/scripts/\${appname}.sh restart
|
||||
else
|
||||
\${mbroot}/apps/\${appname}/scripts/\${appname}.sh stop
|
||||
fi
|
||||
|
||||
}
|
||||
#------------------【$2】--------------------
|
||||
@@ -56,64 +56,64 @@ port=""
|
||||
|
||||
start() {
|
||||
|
||||
[ -n "\$(pidof \${appname})" ] && logsh "【\$service】" "\${appname}已经在运行!" && exit 1
|
||||
logsh "【\$service】" "正在启动\${appname}服务... "
|
||||
# cru a "\${appname}" "0 6 * * * \${mbroot}/apps/\${appname}/scripts/\${appname}.sh restart"
|
||||
# Scripts Here
|
||||
[ -n "\$(pidof \${appname})" ] && logsh "【\$service】" "\${appname}已经在运行!" && exit 1
|
||||
logsh "【\$service】" "正在启动\${appname}服务... "
|
||||
# cru a "\${appname}" "0 6 * * * \${mbroot}/apps/\${appname}/scripts/\${appname}.sh restart"
|
||||
# Scripts Here
|
||||
|
||||
# open_port
|
||||
# write_firewall_start
|
||||
daemon \${mbroot}/apps/\${appname}/bin/\${appname}
|
||||
if [ \$? -ne 0 ]; then
|
||||
logsh "【\$service】" "启动\${appname}服务失败!" && end
|
||||
else
|
||||
logsh "【\$service】" "启动\${appname}服务完成!"
|
||||
# logsh "【\$service】" "请在浏览器打开地址:http://\$lanip:\$port"
|
||||
fi
|
||||
|
||||
# open_port
|
||||
# write_firewall_start
|
||||
daemon \${mbroot}/apps/\${appname}/bin/\${appname}
|
||||
if [ \$? -ne 0 ]; then
|
||||
logsh "【\$service】" "启动\${appname}服务失败!" && end
|
||||
else
|
||||
logsh "【\$service】" "启动\${appname}服务完成!"
|
||||
# logsh "【\$service】" "请在浏览器打开地址:http://\$lanip:\$port"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
stop() {
|
||||
|
||||
logsh "【\$service】" "正在停止\${appname}服务... "
|
||||
[ "\$enable" == '0' ] && destroy
|
||||
# close_port
|
||||
# remove_firewall_start
|
||||
killall -9 \${appname} &> /dev/null
|
||||
logsh "【\$service】" "正在停止\${appname}服务... "
|
||||
[ "\$enable" == '0' ] && destroy
|
||||
# close_port
|
||||
# remove_firewall_start
|
||||
killall -9 \${appname} &> /dev/null
|
||||
|
||||
}
|
||||
|
||||
destroy() {
|
||||
|
||||
# End app, Scripts here
|
||||
# cru d "\${appname}"
|
||||
return
|
||||
|
||||
# End app, Scripts here
|
||||
# cru d "\${appname}"
|
||||
return
|
||||
|
||||
}
|
||||
|
||||
end() {
|
||||
|
||||
mbdb set \${appname}.main.enable=0
|
||||
stop && exit 1
|
||||
mbdb set \${appname}.main.enable=0
|
||||
stop && exit 1
|
||||
|
||||
}
|
||||
|
||||
status() {
|
||||
|
||||
if [ -n "\$(pidof \${appname})" ]; then
|
||||
status="运行中|1"
|
||||
else
|
||||
status="未运行|0"
|
||||
fi
|
||||
mbdb set \${appname}.main.status="\$status"
|
||||
if [ -n "\$(pidof \${appname})" ]; then
|
||||
status="运行中|1"
|
||||
else
|
||||
status="未运行|0"
|
||||
fi
|
||||
mbdb set \${appname}.main.status="\$status"
|
||||
}
|
||||
|
||||
case "\$1" in
|
||||
start) start ;;
|
||||
stop) stop ;;
|
||||
restart) stop; start ;;
|
||||
reload) close_port && open_port ;;
|
||||
status) status ;;
|
||||
start) start ;;
|
||||
stop) stop ;;
|
||||
restart) stop; start ;;
|
||||
reload) close_port && open_port ;;
|
||||
status) status ;;
|
||||
esac
|
||||
|
||||
EOF
|
||||
|
||||
Reference in New Issue
Block a user