Febbweiss/rclone_script
1
0
Fork 0
mirror of https://github.com/Febbweiss/rclone_script.git synced 2026-03-04 22:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed CANCEL button when setting the remote base dir

Browse Source 
changed the way remotebasedir is checked in step 7a
This commit is contained in:
Jandalf81
2018-09-01 12:54:51 +02:00
parent 67bb5c013e
commit a8564b2022
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
rclone_script-install.sh
View File

@@ -712,6 +712,7 @@ function 4cConfigureRCLONE_SCRIPT ()
--colors \ --colors \
--no-collapse \ --no-collapse \
--cr-wrap \ --cr-wrap \
--no-cancel \
--backtitle "${backtitle}" \ --backtitle "${backtitle}" \
--title "Remote base directory" \ --title "Remote base directory" \
--inputbox "\nPlease name the directory which will be used as your ${YELLOW}remote base directory${NORMAL}. If necessary, this directory will be created.\n\nExamples:\n* RetroArch\n* mySaves/RetroArch\n\n" 18 40 "RetroArch" --inputbox "\nPlease name the directory which will be used as your ${YELLOW}remote base directory${NORMAL}. If necessary, this directory will be created.\n\nExamples:\n* RetroArch\n* mySaves/RetroArch\n\n" 18 40 "RetroArch"
@@ -984,28 +985,32 @@ function 7aCheckRemoteBaseDirectory ()
{ {
printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tSTART\n" >> "${logfile}" printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tSTART\n" >> "${logfile}"
# list all directories from remote # try to read remote base dir
remoteDirs=$(rclone lsf --dirs-only -R retropie:) rclone lsf "retropie:${remotebasedir}/" > /dev/null 2>&1
# for each line...
while read path
do
if [ "${path}" == "${remotebasedir}/" ]
then
printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tFOUND\n" >> "${logfile}"
return 0
fi
done <<< "${remoteDirs}"
# if there has been no match...
printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tNOT FOUND\n" >> "${logfile}"
rclone mkdir retropie:"${remotebasedir}" >> "${logfile}"
case $? in case $? in
0) printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tCREATED\n" >> "${logfile}"; return 1 ;; 0)
*) printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tERROR\n" >> "${logfile}"; return 255 ;; printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tFOUND\n" >> "${logfile}"
return 0
;;
3)
printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tNOT FOUND\n" >> "${logfile}"
rclone mkdir "retropie:${remotebasedir}" >> "${logfile}"
case $? in
0)
printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tCREATED\n" >> "${logfile}"
return 1
;;
*)
printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tERROR\n" >> "${logfile}"
return 255
;;
esac
;;
*)
printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tERROR\n" >> "${logfile}"
return 255
;;
esac esac
} }
@@ -1022,7 +1027,7 @@ function 7bCheckRemoteSystemDirectories ()
local output local output
# list all directories in $REMOTEBASEDIR from remote # list all directories in $REMOTEBASEDIR from remote
remoteDirs=$(rclone lsf --dirs-only -R retropie:"${remotebasedir}") remoteDirs=$(rclone lsf --dirs-only "retropie:${remotebasedir}/")
# for each directory in ROMS directory... # for each directory in ROMS directory...
for directory in ~/RetroPie/roms/* for directory in ~/RetroPie/roms/*