github/plexupdate
1
0
Fork 0
mirror of https://github.com/mrworf/plexupdate.git synced 2025-08-20 21:33:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Give existing users explaination as to why plexupdate.sh failed"

Browse source 
This reverts commit 47a294a4ad.
This commit is contained in:
Henric Andersson 2016-11-20 19:02:33 -08:00
commit 03ad32b531
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plexupdate.sh
View file

@ -258,15 +258,8 @@ if ! hash wget 2>/dev/null; then
fi
# If a config file was specified, or if /etc/plexupdate.conf exists, we'll use it. Otherwise, just skip it.
if [ -z "${CONFIGFILE}" ]; then
if [ -f "/etc/plexupdate.conf" ]; then
CONFIGFILE=/etc/plexupdate.conf
else
error "Due to recent changes, config file must be specified or placed in /etc/plexupdate.conf"
exit 1
fi
fi
source "${CONFIGFILE}" 2>/dev/null
source "${CONFIGFILE:-"/etc/plexupdate.conf"}" 2>/dev/null
# The way I wrote this, it assumes that whatever we put on the command line is what we want and should override
# any values in the configuration file. As a result, we need to check if they've been set on the command line