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

Merge branch 'reworklog' of github.com:demonbane/plexupdate into reworklog

Browse source 
Conflicts:
	extras/installer.sh
	plexupdate.sh

This is the result of rebasing with github.com:mrworf/plexupdate
This commit is contained in:
Henric Andersson 2016-11-28 20:16:35 -08:00
commit 3a08026464
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plexupdate.sh
View file

@ -286,6 +286,9 @@ else
VERBOSE=no VERBOSE=no
fi fi
# If a config file was specified, or if /etc/plexupdate.conf exists, we'll use it. Otherwise, just skip it.
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 # 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 # any values in the configuration file. As a result, we need to check if they've been set on the command line
# and overwrite the values that may have been loaded with the config file # and overwrite the values that may have been loaded with the config file