elias/ark-ac-server-tools
1
0
Fork 0
mirror of https://github.com/eliasstepanik/ark-ac-server-tools.git synced 2026-01-14 19:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix config ordering

Browse Source 
* First default instance if set
* Then in order from ~/.arkmanager.cfg
* Then in order from /etc/arkmanager/arkmanager.cfg
* Then in order from ~/.config/arkmanager/instances/*.cfg
* Then in order from /etc/arkmanager/config/*.cfg
This commit is contained in:
Ben Peddell 2019-01-24 19:16:09 +10:00
parent 80fa077225
commit fd722330c8
1 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
tools/arkmanager
View File

@ -3044,26 +3044,58 @@ printStatus(){
getAllInstanceNames(){
declare -A instancenames
for varname in "${!configfile_@}"; do
instancename="${varname#configfile_}"
instancenames[${instancename}]="${instancename}"
if [ -n "${defaultinstance}" ]; then
instancenames[${defaultinstance}]="${defaultinstance}"
echo "${defaultinstance}"
fi
if [ -f "${HOME}/${arkstUserCfgFile}" ]; then
while read l <&3; do
v="${l%%=*}"
if [[ "${v}" = configfile_* ]]; then
if [ -n "${!v}" ]; then
instancename="${v#configfile_}"
if [ -z "${instancenames[${instancename}]}" ]; then
instancenames[${instancename}]="${instancename}"
echo "${instancename}"
fi
fi
fi
done 3<"${HOME}/${arkstUserCfgFile}"
fi
if [ -f "${arkstGlobalCfgFile}" ]; then
while read l <&3; do
v="${l%%=*}"
if [[ "${v}" = configfile_* ]]; then
if [ -n "${!v}" ]; then
instancename="${v#configfile_}"
if [ -z "${instancenames[${instancename}]}" ]; then
instancenames[${instancename}]="${instancename}"
echo "${instancename}"
fi
fi
fi
done 3<"${arkstGlobalCfgFile}"
fi
for f in ${HOME}/.config/arkmanager/instances/*.cfg; do
if [ -f "${f}" ]; then
instancename="${f##*/}"
instancename="${instancename%.cfg}"
if [ -z "${instancenames[${instancename}]}" ]; then
instancenames[${instancename}]="${instancename}"
echo "${instancename}"
fi
fi
done
for f in /etc/arkmanager/instances/*.cfg; do
if [ -f "${f}" ]; then
instancename="${f##*/}"
instancename="${instancename%.cfg}"
instancenames[${instancename}]="${instancename}"
if [ -z "${instancenames[${instancename}]}" ]; then
instancenames[${instancename}]="${instancename}"
echo "${instancename}"
fi
fi
done
for f in ${HOME}/.config/arkmanager/instances/*.cfg; do
if [ -f "${f}" ]; then
instancename="${f##*/}"
instancename="${instancename%.cfg}"
instancenames[${instancename}]="${instancename}"
fi
done
echo "${instancenames[@]}"
}
doListAllInstances(){