mirror of
https://github.com/mrworf/plexupdate.git
synced 2025-07-30 11:38:33 -07:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
54b70708c3
2 changed files with 16 additions and 6 deletions
|
@ -42,6 +42,10 @@ There are a few other options for the more enterprising user. Setting any of the
|
||||||
Normally plexupdate.sh will avoid downloading a file it already has or if it's the same as the installed version, but this allows you to override.
|
Normally plexupdate.sh will avoid downloading a file it already has or if it's the same as the installed version, but this allows you to override.
|
||||||
- PRINT_URL
|
- PRINT_URL
|
||||||
Authenticate, fetch the download URL, print it, and then exit.
|
Authenticate, fetch the download URL, print it, and then exit.
|
||||||
|
- REDHAT_INSTALL
|
||||||
|
The commandline used to install .rpm packages, only change if you need special options
|
||||||
|
- DEBIAN_INSTALL
|
||||||
|
The commandline used to install .deb packages, only change if you need special options
|
||||||
|
|
||||||
Most of these options can be specified on the command-line as well, this is just a more convenient way of doing it if you're scripting it. Which brings us to...
|
Most of these options can be specified on the command-line as well, this is just a more convenient way of doing it if you're scripting it. Which brings us to...
|
||||||
|
|
||||||
|
|
|
@ -60,6 +60,10 @@ CRON=no
|
||||||
QUIET=no
|
QUIET=no
|
||||||
SILENT=no
|
SILENT=no
|
||||||
|
|
||||||
|
# Default options for package managers, override if needed
|
||||||
|
REDHAT_INSTALL="yum -y install"
|
||||||
|
DEBIAN_INSTALL="dpkg -i"
|
||||||
|
|
||||||
# Sanity, make sure wget is in our path...
|
# Sanity, make sure wget is in our path...
|
||||||
wget >/dev/null 2>/dev/null
|
wget >/dev/null 2>/dev/null
|
||||||
if [ $? -eq 127 ]; then
|
if [ $? -eq 127 ]; then
|
||||||
|
@ -184,8 +188,8 @@ if [ "${AUTOUPDATE}" == "yes" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Sanity check
|
# Sanity check
|
||||||
if [ "${EMAIL}" == "" -o "${PASS}" == "" ] && [ "${PUBLIC}" == "no" ]; then
|
if [ "${EMAIL}" == "" -o "${PASS}" == "" ] && [ "${PUBLIC}" == "no" ] && [ ! -f /tmp/kaka ]; then
|
||||||
echo "Error: Need username & password to download PlexPass version. Otherwise run with -p to download public version." >&2
|
echo "Error: Need username & password or -k option to download PlexPass version. Otherwise run with -p to download public version." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -242,9 +246,11 @@ keypair() {
|
||||||
|
|
||||||
# Setup an exit handler so we cleanup
|
# Setup an exit handler so we cleanup
|
||||||
function cleanup {
|
function cleanup {
|
||||||
rm /tmp/kaka 2>/dev/null >/dev/null
|
|
||||||
rm /tmp/postdata 2>/dev/null >/dev/null
|
rm /tmp/postdata 2>/dev/null >/dev/null
|
||||||
rm /tmp/raw 2>/dev/null >/dev/null
|
rm /tmp/raw 2>/dev/null >/dev/null
|
||||||
|
if [ "${KEEP}" != "yes" ]; then
|
||||||
|
rm /tmp/kaka 2>/dev/null >/dev/null
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
trap cleanup EXIT
|
trap cleanup EXIT
|
||||||
|
|
||||||
|
@ -298,7 +304,7 @@ if [ "${KEEP}" != "yes" -o ! -f /tmp/kaka ] && [ "${PUBLIC}" == "no" ]; then
|
||||||
if [ "${CRON}" = "no" ]; then
|
if [ "${CRON}" = "no" ]; then
|
||||||
echo "OK"
|
echo "OK"
|
||||||
fi
|
fi
|
||||||
else
|
elif [ "$PUBLIC" != "no" ]; then
|
||||||
# It's a public version, so change URL and make doubly sure that cookies are empty
|
# It's a public version, so change URL and make doubly sure that cookies are empty
|
||||||
rm 2>/dev/null >/dev/null /tmp/kaka
|
rm 2>/dev/null >/dev/null /tmp/kaka
|
||||||
touch /tmp/kaka
|
touch /tmp/kaka
|
||||||
|
@ -378,9 +384,9 @@ fi
|
||||||
|
|
||||||
if [ "${AUTOINSTALL}" == "yes" ]; then
|
if [ "${AUTOINSTALL}" == "yes" ]; then
|
||||||
if [ "${REDHAT}" == "yes" ]; then
|
if [ "${REDHAT}" == "yes" ]; then
|
||||||
sudo yum -y install "${DOWNLOADDIR}/${FILENAME}"
|
sudo ${REDHAT_INSTALL} "${DOWNLOADDIR}/${FILENAME}"
|
||||||
else
|
else
|
||||||
sudo dpkg -i "${DOWNLOADDIR}/${FILENAME}"
|
sudo ${DEBIAN_INSTALL} "${DOWNLOADDIR}/${FILENAME}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue