github/plexupdate
1
0
Fork 0
mirror of https://github.com/mrworf/plexupdate.git synced 2025-08-19 12:59:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show what config is being used to avoid confusion

Browse source
This commit is contained in:
Henric Andersson 2016-11-10 16:27:51 -08:00
commit 21e678c790
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plexupdate.sh
View file

@ -314,7 +314,7 @@ fi
# Allow manual control of configfile # Allow manual control of configfile
if [ ! -z "${CONFIGFILE}" ]; then if [ ! -z "${CONFIGFILE}" ]; then
if [ -f "${CONFIGFILE}" ]; then if [ -f "${CONFIGFILE}" ]; then
infoLog "Using configuration: ${CONFIGFILE}" >/dev/null infoLog "Using configuration: ${CONFIGFILE}" #>/dev/null
source "${CONFIGFILE}" source "${CONFIGFILE}"
else else
errorLog "Cannot load configuration ${CONFIGFILE}" errorLog "Cannot load configuration ${CONFIGFILE}"
@ -346,18 +346,18 @@ else
fi fi
if [ ! -z "${CONFIGDIR}" -a -f "${CONFIGDIR}/.plexupdate" ]; then if [ ! -z "${CONFIGDIR}" -a -f "${CONFIGDIR}/.plexupdate" ]; then
infoLog "Using \"${SUDO_USER}\" configuration: ${CONFIGDIR}/.plexupdate" >/dev/null infoLog "Using \"${SUDO_USER}\" configuration: ${CONFIGDIR}/.plexupdate" #>/dev/null
CONFIGFILE="${CONFIGDIR}/.plexupdate" CONFIGFILE="${CONFIGDIR}/.plexupdate"
source "${CONFIGDIR}/.plexupdate" source "${CONFIGDIR}/.plexupdate"
elif [ -f ~/.plexupdate ]; then elif [ -f ~/.plexupdate ]; then
# Fallback for compatibility # Fallback for compatibility
infoLog "Using \"${SUDO_USER}\" configuration: ${HOME}/.plexupdate" >/dev/null infoLog "Using \"${SUDO_USER}\" configuration: ${HOME}/.plexupdate" #>/dev/null
CONFIGFILE="${HOME}/.plexupdate" # tilde expansion won't happen later. CONFIGFILE="${HOME}/.plexupdate" # tilde expansion won't happen later.
source ~/.plexupdate source ~/.plexupdate
fi fi
elif [ -f ~/.plexupdate ]; then elif [ -f ~/.plexupdate ]; then
# Fallback for compatibility # Fallback for compatibility
infoLog "Using configuration: ${HOME}/.plexupdate" >/dev/null infoLog "Using configuration: ${HOME}/.plexupdate" #>/dev/null
CONFIGFILE="${HOME}/.plexupdate" CONFIGFILE="${HOME}/.plexupdate"
source ~/.plexupdate source ~/.plexupdate
fi fi