script/nextcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error determin configuration file.

Browse Source
This commit is contained in:
Christoph 2023-08-04 01:39:40 +02:00
parent 2f8d771420
commit 588eb68502
5 changed files with 87 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
occ_file_scan_all_accounts.sh
View File

@ -133,13 +133,11 @@ error(){
}
warn (){
echo ""
if $terminal ; then
echo ""
echo -e " [ \033[33m\033[1mWarning\033[m ]: $*"
else
echo " [ Warning ]: $*"
echo ""
fi
echo ""
}
info (){
@ -174,6 +172,14 @@ blank_line() {
}
# - Running in a terminal?
# -
if [[ -t 1 ]] ; then
terminal=true
else
terminal=false
fi
# ----------
# - Jobhandling
@ -214,6 +220,17 @@ if [[ -z "$WEBSITE" ]] ; then
#
source ${snippet_dir}/get-cloud-instance-to-update.sh
else
while IFS='' read -r -d '' _conf_file ; do
if $(grep -E -q "WEBSITE=\"?${WEBSITE}\"?" ${_conf_file} 2> /dev/null) ; then
conf_file="${_conf_file}"
break
fi
done < <(find "${conf_dir}" -maxdepth 1 -type f -name "*.conf" -print0)
# conf_file="${conf_dir}/${WEBSITE}.conf"
fi
@ -227,7 +244,7 @@ DEFAULT_HTTP_GROUP="www-data"
DEFAULT_PHP_ENGINE='FPM'
echo ""
echononl " Include Configuration file.."
echononl " Include Configuration file '$(basename "${conf_file}")'.."
if [[ ! -f $conf_file ]]; then
echo_failed
fatal "Missing configuration file '$conf_file'."
@ -264,14 +281,6 @@ else
SYSTEMD_EXISTS=true
fi
# - Running in a terminal?
# -
if [[ -t 1 ]] ; then
terminal=true
else
terminal=false
fi
#clear
if $terminal ; then

33
occ_file_scan_app-data.sh
View File

@ -140,13 +140,11 @@ error(){
}
warn (){
echo ""
if $terminal ; then
echo ""
echo -e " [ \033[33m\033[1mWarning\033[m ]: $*"
else
echo " [ Warning ]: $*"
echo ""
fi
echo ""
}
info (){
@ -181,6 +179,14 @@ blank_line() {
}
# - Running in a terminal?
# -
if [[ -t 1 ]] ; then
terminal=true
else
terminal=false
fi
# ----------
# - Jobhandling
@ -221,6 +227,15 @@ if [[ -z "$WEBSITE" ]] ; then
#
source ${snippet_dir}/get-cloud-instance-to-update.sh
else
while IFS='' read -r -d '' _conf_file ; do
if $(grep -E -q "WEBSITE=\"?${WEBSITE}\"?" ${_conf_file} 2> /dev/null) ; then
conf_file="${_conf_file}"
break
fi
done < <(find "${conf_dir}" -maxdepth 1 -type f -name "*.conf" -print0)
# conf_file="${conf_dir}/${WEBSITE}.conf"
fi
@ -234,7 +249,7 @@ DEFAULT_HTTP_GROUP="www-data"
DEFAULT_PHP_ENGINE='FPM'
echo ""
echononl " Include Configuration file.."
echononl " Include Configuration file '$(basename "${conf_file}")'.."
if [[ ! -f $conf_file ]]; then
echo_failed
fatal "Missing configuration file '$conf_file'."
@ -271,14 +286,6 @@ else
SYSTEMD_EXISTS=true
fi
# - Running in a terminal?
# -
if [[ -t 1 ]] ; then
terminal=true
else
terminal=false
fi
#clear
if $terminal ; then

4
occ_maintenance.sh
View File

@ -226,15 +226,17 @@ if [[ -z "$WEBSITE" ]] ; then
#
source ${snippet_dir}/get-cloud-instance-to-update.sh
#fatal "No website ios given on commandline - Missing Parameter '-s <website>'"
else
while IFS='' read -r -d '' _conf_file ; do
if $(grep -E -q "WEBSITE=\"?${WEBSITE}\"?" ${_conf_file} 2> /dev/null) ; then
conf_file="${_conf_file}"
break
fi
done < <(find "${conf_dir}" -maxdepth 1 -type f -name "*.conf" -print0)
# conf_file="${conf_dir}/${WEBSITE}.conf"
fi

33
occ_manual_upgrade.sh
View File

@ -139,13 +139,11 @@ error(){
}
warn (){
echo ""
if $terminal ; then
echo ""
echo -e " [ \033[33m\033[1mWarning\033[m ]: $*"
else
echo " [ Warning ]: $*"
echo ""
fi
echo ""
}
info (){
@ -180,6 +178,14 @@ blank_line() {
}
# - Running in a terminal?
# -
if [[ -t 1 ]] ; then
terminal=true
else
terminal=false
fi
# ----------
# - Jobhandling
@ -220,7 +226,16 @@ if [[ -z "$WEBSITE" ]] ; then
#
source ${snippet_dir}/get-cloud-instance-to-update.sh
#fatal "No website ios given on commandline - Missing Parameter '-s <website>'"
else
while IFS='' read -r -d '' _conf_file ; do
if $(grep -E -q "WEBSITE=\"?${WEBSITE}\"?" ${_conf_file} 2> /dev/null) ; then
conf_file="${_conf_file}"
break
fi
done < <(find "${conf_dir}" -maxdepth 1 -type f -name "*.conf" -print0)
# conf_file="${conf_dir}/${WEBSITE}.conf"
fi
@ -271,14 +286,6 @@ else
SYSTEMD_EXISTS=true
fi
# - Running in a terminal?
# -
if [[ -t 1 ]] ; then
terminal=true
else
terminal=false
fi
#clear
if $terminal ; then

35
occ_update_apps.sh
View File

@ -139,13 +139,11 @@ error(){
}
warn (){
echo ""
if $terminal ; then
echo ""
echo -e " [ \033[33m\033[1mWarning\033[m ]: $*"
else
echo " [ Warning ]: $*"
echo ""
fi
echo ""
}
info (){
@ -180,6 +178,14 @@ blank_line() {
}
# - Running in a terminal?
# -
if [[ -t 1 ]] ; then
terminal=true
else
terminal=false
fi
# ----------
# - Jobhandling
@ -221,6 +227,17 @@ if [[ -z "$WEBSITE" ]] ; then
#
source ${snippet_dir}/get-cloud-instance-to-update.sh
else
while IFS='' read -r -d '' _conf_file ; do
if $(grep -E -q "WEBSITE=\"?${WEBSITE}\"?" ${_conf_file} 2> /dev/null) ; then
conf_file="${_conf_file}"
break
fi
done < <(find "${conf_dir}" -maxdepth 1 -type f -name "*.conf" -print0)
# conf_file="${conf_dir}/${WEBSITE}.conf"
fi
@ -234,7 +251,7 @@ DEFAULT_HTTP_GROUP="www-data"
DEFAULT_PHP_ENGINE='FPM'
echo ""
echononl " Include Configuration file.."
echononl " Include Configuration file.. '$(basename "${conf_file}")'"
if [[ ! -f $conf_file ]]; then
echo_failed
fatal "Missing configuration file '$conf_file'."
@ -271,14 +288,6 @@ else
SYSTEMD_EXISTS=true
fi
# - Running in a terminal?
# -
if [[ -t 1 ]] ; then
terminal=true
else
terminal=false
fi
#clear
if $terminal ; then