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

Use info/warn/error in plexupdate-core

Browse source
This commit is contained in:
Alex Malinovich 2017-02-26 17:51:33 -08:00
commit 5d779709ba
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
plexupdate-core
View file

@ -31,22 +31,22 @@ PLEXUPDATE_FILES="plexupdate.sh plexupdate-core extras/installer.sh extras/cronw
# GPT # GPT
getPlexToken() { getPlexToken() {
if [ -n "$TOKEN" ]; then if [ -n "$TOKEN" ]; then
[ "$VERBOSE" = "yes" ] && echo "Fetching token from config" [ "$VERBOSE" = "yes" ] && info "Fetching token from config"
elif getPlexServerToken; then elif getPlexServerToken; then
[ "$VERBOSE" = "yes" ] && echo "Fetching token from Plex server" [ "$VERBOSE" = "yes" ] && info "Fetching token from Plex server"
elif [ -z "$TOKEN" -a -n "$EMAIL" -a -n "$PASS" ]; then elif [ -z "$TOKEN" -a -n "$EMAIL" -a -n "$PASS" ]; then
#TOFIX #TOFIX
echo "WARNING: Storing your email and password has been deprecated. Please re-run extras/installer.sh or see LINK_TO_FAQ." warn "Storing your email and password has been deprecated. Please re-run extras/installer.sh or see LINK_TO_FAQ."
getPlexWebToken getPlexWebToken
# Check if we're connected to a terminal # Check if we're connected to a terminal
elif [ -z "$TOKEN" -a -t 0 ]; then elif [ -z "$TOKEN" -a -t 0 ]; then
echo "To continue, you will need to provide your Plex account credentials." info "To continue, you will need to provide your Plex account credentials."
echo "Your email and password will only be used to retrieve a 'token' and will not be saved anywhere." info "Your email and password will only be used to retrieve a 'token' and will not be saved anywhere."
echo echo
while true; do while true; do
read -e -p "PlexPass Email Address: " -i "$EMAIL" EMAIL read -e -p "PlexPass Email Address: " -i "$EMAIL" EMAIL
if [ -z "${EMAIL}" ] || [[ "$EMAIL" == *"@"* ]] && [[ "$EMAIL" != *"@"*"."* ]]; then if [ -z "${EMAIL}" ] || [[ "$EMAIL" == *"@"* ]] && [[ "$EMAIL" != *"@"*"."* ]]; then
echo "Please provide a valid email address" info "Please provide a valid email address"
else else
break break
fi fi
@ -54,7 +54,7 @@ getPlexToken() {
while true; do while true; do
read -e -p "PlexPass Password: " -i "$PASS" PASS read -e -p "PlexPass Password: " -i "$PASS" PASS
if [ -z "$PASS" ]; then if [ -z "$PASS" ]; then
echo "Please provide a password" info "Please provide a password"
else else
break break
fi fi
@ -116,9 +116,9 @@ getPlexWebToken() {
# Provide some details to the end user # Provide some details to the end user
RESULTCODE=$(head -n1 "${FILE_RAW}" | grep -oe '[1-5][0-9][0-9]') RESULTCODE=$(head -n1 "${FILE_RAW}" | grep -oe '[1-5][0-9][0-9]')
if [ $RESULTCODE -eq 401 ]; then if [ $RESULTCODE -eq 401 ]; then
echo "ERROR: Username and/or password incorrect" >&2 error "Username and/or password incorrect"
elif [ $RESULTCODE -ne 201 ]; then elif [ $RESULTCODE -ne 201 ]; then
echo "ERROR: Failed to log in, debug information:" >&2 error "Failed to log in, debug information:"
cat "${FILE_RAW}" >&2 cat "${FILE_RAW}" >&2
else else
TOKEN=$(<"${FILE_FAILCAUSE}" grep -ioe '"authToken":"[^"]*' | cut -c 14-) TOKEN=$(<"${FILE_FAILCAUSE}" grep -ioe '"authToken":"[^"]*' | cut -c 14-)
@ -218,5 +218,5 @@ error() {
if [ "$(basename "$0")" = "get-plex-token" ]; then if [ "$(basename "$0")" = "get-plex-token" ]; then
[ -f /etc/plexupdate.conf ] && source /etc/plexupdate.conf [ -f /etc/plexupdate.conf ] && source /etc/plexupdate.conf
getPlexToken && echo "Token = $TOKEN" getPlexToken && info "Token = $TOKEN"
fi fi