Merge pull request #413 from klightspeed/1.5#listinstances

Add configfile name to list-instances
This commit is contained in:
Fez Vrasta 2016-02-18 22:39:24 +01:00
commit 5e8b53be78

View File

@ -1626,25 +1626,31 @@ doListAllInstances(){
( (
echo -n " @${n}: " echo -n " @${n}: "
useConfig "$n" useConfig "$n"
echo "${arkserverroot}" echo "${configfile} => ${arkserverroot}"
) )
done done
fi fi
} }
useConfig() { useConfig() {
configfile=
if [ -f "/etc/arkmanager/instances/${1}.cfg" ]; then if [ -f "/etc/arkmanager/instances/${1}.cfg" ]; then
source "/etc/arkmanager/instances/${1}.cfg" configfile="/etc/arkmanager/instances/${1}.cfg"
fi fi
if [ -f "${HOME}/.config/arkmanager/instances/${1}.cfg" ]; then if [ -f "${HOME}/.config/arkmanager/instances/${1}.cfg" ]; then
source "${HOME}/.config/arkmanager/instances/${1}.cfg" configfile="${HOME}/.config/arkmanager/instances/${1}.cfg"
fi fi
for varname in "${!configfile_@}"; do for varname in "${!configfile_@}"; do
if [ "configfile_$1" == "$varname" ]; then if [ "configfile_$1" == "$varname" ]; then
source "${!varname}" configfile="${!varname}"
break break
fi fi
done done
if [ -a "$configfile" ]; then
echo "Error: config file ${configfile} does not exist"
exit 1
fi
source "$configfile"
if [ -z "$arkserverroot" ]; then if [ -z "$arkserverroot" ]; then
echo "Error: arkserverroot not set" echo "Error: arkserverroot not set"
exit 1 exit 1