diff --git a/mm-scripts.sh b/mm-scripts.sh index 766350e..6c6cbb1 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -1132,14 +1132,12 @@ SERVICEBACKUP(){ ([ "${3}" == "true" ] || [ "${2}" == "true" ]) && SERVICEBACKUPSTART ${usrvc} - if [ "${usrvc}" == "radarr" ]; then - echo - SERVICEBACKUP ${usrvc}3d ${2} ${3} - fi + [ "${usrvc}" == "radarr" ] && SERVICEBACKUP ${usrvc}3d ${2} ${3} fi } SERVICEBACKUPSTART(){ + usrvc=${1} msg="Starting Service"; c=0; spc=''; spc1=$((${cw_spc}-${#msg})); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}" OUT=$(ip link | grep "$VPN_INTERFACE") >/dev/null 2>&1 @@ -1158,8 +1156,9 @@ SERVICERESTORE(){ BACKUPDIR=${MM_BACKUP_FOLDER}/${srvc} echo -e "${idsCL[LightCyan]}Select a backup to restore:${idsCL[Default]}" echo; f=1 - for FILE in ${BACKUPDIR}/*.tgz; do - echo -e "[${f}] ${FILE}" + for bakfile in ${BACKUPDIR}/*.tgz; do + fname=${bakfile/${BACKUPDIR}\/${srvc}\//} + echo -e "[${f}] ${fname}" f=$((f+1))