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 0132d4f89a into 32828572a7

Browse source
This commit is contained in:
Aleritty 2016-09-30 00:22:58 +00:00 • committed by GitHub
commit 19015d1b4e
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plexupdate.sh
View file

@ -61,6 +61,7 @@ CRON=no
QUIET=no QUIET=no
ARCH=$(uname -m) ARCH=$(uname -m)
IGNOREAUTOUPDATE=no IGNOREAUTOUPDATE=no
SHOWPROGRESS=no
# Default options for package managers, override if needed # Default options for package managers, override if needed
REDHAT_INSTALL="yum -y install" REDHAT_INSTALL="yum -y install"
@ -135,7 +136,7 @@ cronexit() {
} }
usage() { usage() {
echo "Usage: $(basename $0) [-acfhopqsSuU] [config file]" echo "Usage: $(basename $0) [-acfhopPqsSuU] [config file]"
echo "" echo ""
echo " config file overrides the default ~/.plexupdate" echo " config file overrides the default ~/.plexupdate"
echo " If used, it must be the LAST option or it will be ignored" echo " If used, it must be the LAST option or it will be ignored"
@ -149,6 +150,7 @@ usage() {
echo " -h This help" echo " -h This help"
echo " -l List available builds and distros" echo " -l List available builds and distros"
echo " -p Public Plex Media Server version" echo " -p Public Plex Media Server version"
echo " -P Show progressbar when downloading big files"
echo " -q Quiet mode. No stdout, only stderr and cronexit codes" echo " -q Quiet mode. No stdout, only stderr and cronexit codes"
echo " -r Print download URL and exit" echo " -r Print download URL and exit"
echo " -s Auto start (needed for some distros)" echo " -s Auto start (needed for some distros)"
@ -185,7 +187,7 @@ running() {
# Parse commandline # Parse commandline
ALLARGS=( "$@" ) ALLARGS=( "$@" )
optstring="acCdfFhlpqrSsuU" optstring="acCdfFhlpPqrSsuU"
getopt -T >/dev/null getopt -T >/dev/null
if [ $? -eq 4 ]; then if [ $? -eq 4 ]; then
optstring="-o $optstring" optstring="-o $optstring"
@ -203,6 +205,7 @@ do
(-F) FORCEALL=yes;; (-F) FORCEALL=yes;;
(-l) LISTOPTS=yes;; (-l) LISTOPTS=yes;;
(-p) PUBLIC=yes;; (-p) PUBLIC=yes;;
(-P) SHOWPROGRESS=yes;;
(-q) QUIET=yes;; (-q) QUIET=yes;;
(-r) PRINT_URL=yes;; (-r) PRINT_URL=yes;;
(-s) AUTOSTART=yes;; (-s) AUTOSTART=yes;;
@ -531,7 +534,13 @@ fi
if [ "${SKIP_DOWNLOAD}" = "no" ]; then if [ "${SKIP_DOWNLOAD}" = "no" ]; then
echo -ne "Downloading release \"${FILENAME}\"..." echo -ne "Downloading release \"${FILENAME}\"..."
ERROR=$(wget --load-cookies /tmp/kaka --save-cookies /tmp/kaka --keep-session-cookies "${DOWNLOAD}" -O "${DOWNLOADDIR}/${FILENAME}" 2>&1) if [ "${SHOWPROGRESS}" = "yes" ]; then
echo
ERROR=$(wget -q --show-progress --load-cookies /tmp/kaka --save-cookies /tmp/kaka --keep-session-cookies "${DOWNLOAD}" -O "${DOWNLOADDIR}/${FILENAME}")
echo
else
ERROR=$(wget --load-cookies /tmp/kaka --save-cookies /tmp/kaka --keep-session-cookies "${DOWNLOAD}" -O "${DOWNLOADDIR}/${FILENAME}" 2>&1)
fi
CODE=$? CODE=$?
if [ ${CODE} -ne 0 ]; then if [ ${CODE} -ne 0 ]; then
echo -e "\n !! Download failed with code ${CODE}, \"${ERROR}\"" echo -e "\n !! Download failed with code ${CODE}, \"${ERROR}\""