Merge pull request #4 from 007revad/develop

Develop

Author: 007revad

CHANGES.txt

@@ -1,2 +1,5 @@
+v1.0.2
+- Added restore script.
+
 v1.0.1
 - First release.

Linux_Plex_Backup.sh

@@ -2,7 +2,7 @@
 # shellcheck disable=SC2317,SC2181
 #--------------------------------------------------------------------------
 # Backup Linux Plex Database to tgz file in Backup folder.
-# v1.0.1  08-May-2024  007revad
+# v1.0.2  08-May-2024  007revad
 #
 #   MUST be run by a user in sudo, sudoers or wheel group, or as root
 #
@@ -18,7 +18,7 @@
 # Script verified at https://www.shellcheck.net/
 #--------------------------------------------------------------------------
 
-scriptver="v1.0.1"
+scriptver="v1.0.2"
 script=Linux_Plex_Backup
 
 
@@ -114,7 +114,7 @@ Tmp_Err_Log_File=$(mktemp "${Tmp_Dir}"/errorlog-XXXXXX)
 
 # Tmp logs clean up function
 # shellcheck disable=SC2329
-cleanup() {
+cleanup(){ 
     arg1=$?
     # Move tmp_error_log to error log if tmp_error_log is not empty
     if [[ -s $Tmp_Err_Log_File ]] && [[ -d $Backup_Directory ]]; then
@@ -226,7 +226,7 @@ Err_Log_File="${Backup_Directory}"/"${Backup_Name}"_ERROR.log
 #--------------------------------------------------------------------------
 # Start logging
 
-echo -e "$script $scriptver\n"
+echo -e "$script $scriptver\n" |& tee -a "${Log_File}"
 
 # Log Linux distro, version and hostname
 Distro="$(uname -a | awk '{print $2}')"

Restore_Linux_Plex_Backup.sh

@@ -1,48 +1,32 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2317,SC2181
 #--------------------------------------------------------------------------
-# Companion script for Backup Asustor Plex script.
-# v1.0.0  04-Feb-2023  007revad
+# Companion script for Linux Plex Backup script.
+# v1.0.2  10-Apr-2024  007revad
 #
 #   MUST be run by a user in sudo, sudoers or wheel group, or as root
 #
 # To run the script:
-# sudo i /volume1/scripts/restore_asustor_plex_backup.sh
-#   Change /volume1/scripts/ to the path where this script is located
+# sudo i /share/scripts/Restore_Linux_Plex_Backup.sh
+#   Change /share/scripts/ to the path where this script is located
 #
-# Github: https://github.com/007revad/Asustor_Plex_Backup
+# Github: https://github.com/007revad/Linux_Plex_Backup
 # Script verified at https://www.shellcheck.net/
 #--------------------------------------------------------------------------
-# REQUIRED:
-# Because the Asustor only has BusyBox this script needs bash installed.
-#
-# Install Entware from App Central, then run the following commands via SSH
-# You can run the commands in "Shell In A Box" from App Central, or use PuTTY
-#   opkg update && opkg upgrade
-#   opkg install bash
-#--------------------------------------------------------------------------
 
-# Process Expansion and redirecting stdout and stderr to separate Log and 
-# Error Log causes an error on Asustor NAS unless bash is installed.
-# Check if script is running in GNU bash and not BusyBox ash
-
-Shell=$(/proc/self/exe --version 2>/dev/null | grep "GNU bash" | cut -d "," -f1)
-if [ "$Shell" != "GNU bash" ]; then
-    echo -e "\nYou need to install bash to be able to run this script.\n"
-    echo "1. Install Entware from App Central"
-    echo "2. Run the following commands in a shell:"
-    echo "opkg update && opkg upgrade"
-    echo -e "opkg install bash\n"
-    exit 1
-fi
+scriptver="v1.0.2"
+script=Restore_Linux_Plex_Backup
 
 
-# Read variables from backup_asustor_plex.config
-if [[ -f $(dirname -- "$0";)/backup_asustor_plex.config ]];then
+# Read variables from backup_linux_plex.config
+Backup_Directory=""
+Name=""
+LogAll=""
+if [[ -f $(dirname -- "$0";)/backup_linux_plex.config ]];then
     # shellcheck disable=SC1091
-    source "$(dirname -- "$0";)"/backup_asustor_plex.config
+    source "$(dirname -- "$0";)"/backup_linux_plex.config
 else
-    echo "backup_asustor_plex.config file missing!"
+    echo "backup_linux_plex.config file missing!"
     exit 1
 fi
 
@@ -52,7 +36,7 @@ fi
 if [[ ! -d $Backup_Directory ]]; then
     echo "Backup directory not found:"
     echo "$Backup_Directory"
-    echo "Check your setting in backup_asustor_plex.config"
+    echo "Check your setting in backup_linux_plex.config"
     exit 1
 fi
 
@@ -72,17 +56,9 @@ Started=$( date )
 
 # shellcheck disable=SC2154
 case "${Name,,}" in
-    brand)
-        # Get NAS Brand
-        if [[ -f /etc/nas.conf ]]; then
-            Nas="$(awk '/^Vendor\s/{print $3}' /etc/nas.conf)"
-        fi
-        ;;
-    model)
-        # Get Asustor model
-        if [[ -f /etc/nas.conf ]]; then
-            Nas="$(awk '/^Model\s/{print $3}' /etc/nas.conf)"
-        fi
+    distro)
+        # Get Linux Distro
+        Nas="$(uname -a | awk '{print $2}')"
         ;;
     hostname|"")
         # Get Hostname
@@ -98,7 +74,6 @@ esac
 #--------------------------------------------------------------------------
 # Get list of backups from backup path
 
-# BusyBox gives an error if process substitution is used by non-root user!
 # filelist=()
 # readarray -d '' filelist < <(find "${Backup_Directory}/" -size +100\
 #    \( -iname "${Nas}*.tgz" -o -iname "${Nas}*.tar.gz" \) -print0)
@@ -150,7 +125,6 @@ Backup_Name="Restore_Plex_Backup"
 
 # Set log filename
 Log_File="${Backup_Directory}"/"${Backup_Name}".log
-echo "Restores Asustor Plex Backup" |& tee "${Log_File}"
 
 # Set error log filename
 Err_Log_File="${Backup_Directory}"/"${Backup_Name}"_ERROR.log
@@ -159,8 +133,6 @@ Err_Log_File="${Backup_Directory}"/"${Backup_Name}"_ERROR.log
 #--------------------------------------------------------------------------
 # Create temp error log
 
-# Asustor mktemp only accepts max 6 Xs
-
 # Create temp directory for temp error log
 Tmp_Dir=$(mktemp -d -t plex_to_tar-XXXXXX)
 
@@ -172,7 +144,8 @@ Tmp_Err_Log_File=$(mktemp "${Tmp_Dir}"/errorlog-XXXXXX)
 # Create trap and clean up function
 
 # Tmp logs clean up function
-cleanup() {
+# shellcheck disable=SC2329
+cleanup(){ 
     arg1=$?
     # Move tmp_error_log to error log if tmp_error_log is not empty
     if [[ -s $Tmp_Err_Log_File ]] && [[ -d $Backup_Directory ]]; then
@@ -229,31 +202,11 @@ if [[ $( whoami ) != "root" ]]; then
 fi
 
 
-#--------------------------------------------------------------------------
-# Check script is running on an Asustor NAS
-
-if [[ -f /etc/nas.conf ]]; then Brand="$(awk '/^Vendor\s/{print $3}' /etc/nas.conf)"; fi
-# Returns: ASUSTOR
-
-if [[ ${Brand,,} != "asustor" ]]; then
-    if [[ -d $Backup_Directory ]]; then
-        echo "Checking script is running on a Asustor NAS" |& tee -a "${Tmp_Err_Log_File}"
-        echo "ERROR: $(hostname) is not a Asustor! Aborting." |& tee -a "${Tmp_Err_Log_File}"
-    else
-        # Can't log error to log file because $Backup_Directory does not exist
-        echo -e "\nChecking script is running on a Asustor NAS"
-        echo -e "ERROR: $( hostname ) is not a Asustor! Aborting.\n"
-    fi
-    # Abort script because it's being run on the wrong NAS brand
-    exit 255
-fi
-
-
 #--------------------------------------------------------------------------
 # Find Plex Media Server location
 
 # Set the Plex Media Server data location
-Plex_Data_Path=/share/Plex/Library
+Plex_Data_Path="/var/lib/plexmediaserver/Library/Application Support"
 
 
 #--------------------------------------------------------------------------
@@ -270,7 +223,7 @@ fi
 #--------------------------------------------------------------------------
 # Get Plex Media Server version
 
-Version="$(/usr/local/AppCentral/plexmediaserver/Plex\ Media\ Server --version)"
+Version="$(/usr/lib/plexmediaserver/Plex\ Media\ Server --version)"
 # Returns v1.29.2.6364-6d72b0cf6
 # Plex version without v or hex string
 Version=$(printf %s "${Version:1}"| cut -d "-" -f1)
@@ -280,10 +233,12 @@ Version=$(printf %s "${Version:1}"| cut -d "-" -f1)
 #--------------------------------------------------------------------------
 # Start logging
 
-# Log NAS brand, model, DSM version and hostname
-Model="$(awk '/^Model\s/{print $3}' /etc/nas.conf)"
-ADMversion="$(awk '/^Version\s/{print $3}' /etc/nas.conf)"
-echo "${Brand}" "${Model}" ADM "${ADMversion}" |& tee -a "${Log_File}"
+echo -e "$script $scriptver\n" |& tee -a "${Log_File}"
+
+# Log Linux distro, version and hostname
+Distro="$(uname -a | awk '{print $2}')"
+DistroVersion="$(uname -a | awk '{print $3}' | cut -d"-" -f1)"
+echo "${Distro}" "${DistroVersion}" |& tee -a "${Log_File}"
 echo "Hostname: $( hostname )" |& tee -a "${Log_File}"
 
 # Log Plex version
@@ -295,18 +250,16 @@ echo Plex version: "${Version}" |& tee -a "${Log_File}"
 
 echo "Stopping Plex..." |& tee -a "${Log_File}"
 
-Result=$(/usr/local/AppCentral/plexmediaserver/CONTROL/start-stop.sh stop)
+Result=$(systemctl stop plexmediaserver)
+code="$?"
 # Give sockets a moment to close
 sleep 5
 
-if [[ -n $Result ]]; then
-    if [[ $Result == *"stopped process in pidfile"* ]]; then
-        echo "Plex Media Server has stopped." |& tee -a "$Log_File"
-    elif [[ $Result == *"none killed"* ]]; then
-        echo "Plex Media Server wasn't running." |& tee -a "$Log_File"
-    else
-        echo "$Result" |& tee -a "$Log_File"
-    fi
+if [[ $code == "0" ]]; then
+    echo "Plex Media Server has stopped." |& tee -a "$Log_File"
+else
+    echo "$Result" |& tee -a "$Log_File"
+    exit $code
 fi
 
 
@@ -337,8 +290,8 @@ Response=$(pgrep -l plex)
 # Check if plexmediaserver was found in $Response
 if [[ -n $Response ]]; then
     # Forcefully kill any residual Plex processes (plug-ins, tuner service and EAE etc)
-    pgrep plex | xargs kill -9 &>/dev/null
-    sleep 2
+    pgrep [Pp]lex | xargs kill -9 &>/dev/null
+    sleep 5
 
     # Check if plexmediaserver still found in $Response
     Response=$(pgrep -l plex)
@@ -347,7 +300,7 @@ if [[ -n $Response ]]; then
             |& tee -a "${Log_File}" "${Tmp_Err_Log_File}"
         echo "${Response}" |& tee -a "${Log_File}" "${Tmp_Err_Log_File}"
         # Start Plex to make sure it's not left partially running
-        /usr/local/AppCentral/plexmediaserver/CONTROL/start-stop.sh start
+        /usr/lib/plexmediaserver/Resources/start.sh
         # Abort script because Plex didn't shut down fully
         exit 255
     else
@@ -393,7 +346,7 @@ echo "=================================================" |& tee -a "${Log_File}"
 # Start Plex Media Server
 
 echo "Starting Plex..." |& tee -a "${Log_File}"
-/usr/local/AppCentral/plexmediaserver/CONTROL/start-stop.sh start
+/usr/lib/plexmediaserver/Resources/start.sh
 
 
 #--------------------------------------------------------------------------