From 266a8f42744d36ab43f29dfdc58c3d74ffd1c9e9 Mon Sep 17 00:00:00 2001 From: Jandalf81 Date: Mon, 13 Aug 2018 22:42:09 +0200 Subject: [PATCH] Simplified reference to logfile --- rclone_script-install-dialog.sh | 221 ++++++++++++++++---------------- 1 file changed, 111 insertions(+), 110 deletions(-) diff --git a/rclone_script-install-dialog.sh b/rclone_script-install-dialog.sh index 50a79b9..1a7f97d 100644 --- a/rclone_script-install-dialog.sh +++ b/rclone_script-install-dialog.sh @@ -25,6 +25,7 @@ remotebasedir="" shownotifications="" backtitle="RCLONE_SCRIPT installer" +logfile=~/scripts/rclone_script/rclone_script-install.log ################## @@ -298,14 +299,14 @@ function 1RCLONE () # 1 > RCLONE is not installed function 1aTestRCLONE () { - printf "$(date +%FT%T%:z):\t1aTestRCLONE\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t1aTestRCLONE\tSTART\n" >> "${logfile}" if [ -f /usr/bin/rclone ] then - printf "$(date +%FT%T%:z):\t1aTestRCLONE\tFOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t1aTestRCLONE\tFOUND\n" >> "${logfile}" return 0 else - printf "$(date +%FT%T%:z):\t1aTestRCLONE\tNOT FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t1aTestRCLONE\tNOT FOUND\n" >> "${logfile}" return 1 fi } @@ -316,36 +317,36 @@ function 1aTestRCLONE () # 1 > Error while installing RCLONE function 1bInstallRCLONE () { - printf "$(date +%FT%T%:z):\t1bInstallRCLONE\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t1bInstallRCLONE\tSTART\n" >> "${logfile}" # TODO get RCLONE for 64bit { # try # get binary - wget -P ~ https://downloads.rclone.org/rclone-current-linux-arm.zip --append-output=/home/pi/scripts/rclone_script/rclone_script-install.log && - unzip ~/rclone-current-linux-arm.zip -d ~ >> ~/scripts/rclone_script/rclone_script-install.log && + wget -P ~ https://downloads.rclone.org/rclone-current-linux-arm.zip --append-output="${logfile}" && + unzip ~/rclone-current-linux-arm.zip -d ~ >> "${logfile}" && cd ~/rclone-v* && # move binary - sudo mv rclone /usr/bin >> ~/scripts/rclone_script/rclone_script-install.log && - sudo chown root:root /usr/bin/rclone >> ~/scripts/rclone_script/rclone_script-install.log && - sudo chmod 755 /usr/bin/rclone >> ~/scripts/rclone_script/rclone_script-install.log && + sudo mv rclone /usr/bin >> "${logfile}" && + sudo chown root:root /usr/bin/rclone >> "${logfile}" && + sudo chmod 755 /usr/bin/rclone >> "${logfile}" && cd ~ && # remove temp files - rm ~/rclone-current-linux-arm.zip >> ~/scripts/rclone_script/rclone_script-install.log && - rm -r ~/rclone-v* >> ~/scripts/rclone_script/rclone_script-install.log && + rm ~/rclone-current-linux-arm.zip >> "${logfile}" && + rm -r ~/rclone-v* >> "${logfile}" && - printf "$(date +%FT%T%:z):\t1bInstallRCLONE\tDONE\n" >> ~/scripts/rclone_script/rclone_script-install.log && + printf "$(date +%FT%T%:z):\t1bInstallRCLONE\tDONE\n" >> "${logfile}" && return 0 } || { #catch - printf "$(date +%FT%T%:z):\t1bInstallRCLONE\tERROR\n" >> ~/scripts/rclone_script/rclone_script-install.log && + printf "$(date +%FT%T%:z):\t1bInstallRCLONE\tERROR\n" >> "${logfile}" && # remove temp files - rm ~/rclone-current-linux-arm.zip >> ~/scripts/rclone_script/rclone_script-install.log && - rm -r ~/rclone-v* >> ~/scripts/rclone_script/rclone_script-install.log && + rm ~/rclone-current-linux-arm.zip >> "${logfile}" && + rm -r ~/rclone-v* >> "${logfile}" && return 1 } @@ -357,7 +358,7 @@ function 1bInstallRCLONE () # 1 > no remote RETROPIE found function 1cTestRCLONEremote () { - printf "$(date +%FT%T%:z):\t1cTestRCLONEremote\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t1cTestRCLONEremote\tSTART\n" >> "${logfile}" local remotes=$(rclone listremotes) @@ -365,10 +366,10 @@ function 1cTestRCLONEremote () if [ "${retval}" == "retropie:" ] then - printf "$(date +%FT%T%:z):\t1cTestRCLONEremote\tFOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t1cTestRCLONEremote\tFOUND\n" >> "${logfile}" return 0 else - printf "$(date +%FT%T%:z):\t1cTestRCLONEremote\tNOT FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t1cTestRCLONEremote\tNOT FOUND\n" >> "${logfile}" return 1 fi } @@ -378,7 +379,7 @@ function 1cTestRCLONEremote () # 0 > remote RETROPIE has been created (no other OUTPUT possible) function 1dCreateRCLONEremote () { - printf "$(date +%FT%T%:z):\t1dCreateRCLONEremote\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t1dCreateRCLONEremote\tSTART\n" >> "${logfile}" dialog \ --stdout \ @@ -409,7 +410,7 @@ function 1dCreateRCLONEremote () 1dCreateRCLONEremote else - printf "$(date +%FT%T%:z):\t1dCreateRCLONEremote\tFOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t1dCreateRCLONEremote\tFOUND\n" >> "${logfile}" return 0 fi } @@ -460,14 +461,14 @@ function 2PNGVIEW () # 1 > PNGVIEW is not installed function 2aTestPNGVIEW () { - printf "$(date +%FT%T%:z):\t2aTestPNGVIEW\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t2aTestPNGVIEW\tSTART\n" >> "${logfile}" if [ -f /usr/bin/pngview ] then - printf "$(date +%FT%T%:z):\t2aTestPNGVIEW\tFOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t2aTestPNGVIEW\tFOUND\n" >> "${logfile}" return 0 else - printf "$(date +%FT%T%:z):\t2aTestPNGVIEW\tNOT FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t2aTestPNGVIEW\tNOT FOUND\n" >> "${logfile}" return 1 fi } @@ -478,20 +479,20 @@ function 2aTestPNGVIEW () # 1 > no source downloaded, removed temp files function 2bGetPNGVIEWsource () { - printf "$(date +%FT%T%:z):\t2bGetPNGVIEWsource\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t2bGetPNGVIEWsource\tSTART\n" >> "${logfile}" { #try - wget -P ~ https://github.com/AndrewFromMelbourne/raspidmx/archive/master.zip --append-output=/home/pi/scripts/rclone_script/rclone_script-install.log && - unzip ~/master.zip -d ~ >> ~/scripts/rclone_script/rclone_script-install.log && + wget -P ~ https://github.com/AndrewFromMelbourne/raspidmx/archive/master.zip --append-output="${logfile}" && + unzip ~/master.zip -d ~ >> "${logfile}" && - printf "$(date +%FT%T%:z):\t2bGetPNGVIEWsource\tDONE\n" >> ~/scripts/rclone_script/rclone_script-install.log && + printf "$(date +%FT%T%:z):\t2bGetPNGVIEWsource\tDONE\n" >> "${logfile}" && return 0 } || { #catch - printf "$(date +%FT%T%:z):\t2bGetPNGVIEWsource\tERROR\n" >> ~/scripts/rclone_script/rclone_script-install.log && + printf "$(date +%FT%T%:z):\t2bGetPNGVIEWsource\tERROR\n" >> "${logfile}" && - rm ~/master.zip >> ~/scripts/rclone_script/rclone_script-install.log && - sudo rm -r ~/raspidmx-master >> ~/scripts/rclone_script/rclone_script-install.log && + rm ~/master.zip >> "${logfile}" && + sudo rm -r ~/raspidmx-master >> "${logfile}" && return 1 } @@ -503,32 +504,32 @@ function 2bGetPNGVIEWsource () # 1 > errors while compiling, removed temp files function 2cCompilePNGVIEW () { - printf "$(date +%FT%T%:z):\t2cCompilePNGVIEW\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t2cCompilePNGVIEW\tSTART\n" >> "${logfile}" { #try # compile # cd ~/raspidmx-master && - make --directory=~/raspidmx-master >> ~/scripts/rclone_script/rclone_script-install.log && + make --directory=~/raspidmx-master >> "${logfile}" && # move binary files - sudo mv ~/raspidmx-master/pngview/pngview /usr/bin >> ~/scripts/rclone_script/rclone_script-install.log && - sudo mv ~/raspidmx-master/lib/libraspidmx.so.1 /usr/lib >> ~/scripts/rclone_script/rclone_script-install.log && - sudo chown root:root /usr/bin/pngview >> ~/scripts/rclone_script/rclone_script-install.log && - sudo chmod 755 /usr/bin/pngview >> ~/scripts/rclone_script/rclone_script-install.log && + sudo mv ~/raspidmx-master/pngview/pngview /usr/bin >> "${logfile}" && + sudo mv ~/raspidmx-master/lib/libraspidmx.so.1 /usr/lib >> "${logfile}" && + sudo chown root:root /usr/bin/pngview >> "${logfile}" && + sudo chmod 755 /usr/bin/pngview >> "${logfile}" && # remove temp files - rm ~/master.zip >> ~/scripts/rclone_script/rclone_script-install.log && - sudo rm -r ~/raspidmx-master >> ~/scripts/rclone_script/rclone_script-install.log && + rm ~/master.zip >> "${logfile}" && + sudo rm -r ~/raspidmx-master >> "${logfile}" && - printf "$(date +%FT%T%:z):\t2cCompilePNGVIEW\tDONE\n" >> ~/scripts/rclone_script/rclone_script-install.log && + printf "$(date +%FT%T%:z):\t2cCompilePNGVIEW\tDONE\n" >> "${logfile}" && return 0 } || { #catch - printf "$(date +%FT%T%:z):\t2cCompilePNGVIEW\tERROR\n" >> ~/scripts/rclone_script/rclone_script-install.log && + printf "$(date +%FT%T%:z):\t2cCompilePNGVIEW\tERROR\n" >> "${logfile}" && # remove temp files - rm ~/master.zip >> ~/scripts/rclone_script/rclone_script-install.log && - sudo rm -r ~/raspidmx-master >> ~/scripts/rclone_script/rclone_script-install.log && + rm ~/master.zip >> "${logfile}" && + sudo rm -r ~/raspidmx-master >> "${logfile}" && return 1 } @@ -565,14 +566,14 @@ function 3IMAGEMAGICK () # 1 > IMAGEMAGICK is not installed function 3aTestIMAGEMAGICK () { - printf "$(date +%FT%T%:z):\t3aTestIMAGEMAGICK\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t3aTestIMAGEMAGICK\tSTART\n" >> "${logfile}" if [ -f /usr/bin/convert ] then - printf "$(date +%FT%T%:z):\t3aTestIMAGEMAGICK\tFOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t3aTestIMAGEMAGICK\tFOUND\n" >> "${logfile}" return 0 else - printf "$(date +%FT%T%:z):\t3aTestIMAGEMAGICK\tNOT FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t3aTestIMAGEMAGICK\tNOT FOUND\n" >> "${logfile}" return 1 fi } @@ -583,17 +584,17 @@ function 3aTestIMAGEMAGICK () # 1 > Error while installing IMAGEMAGICK function 3bInstallIMAGEMAGICK () { - printf "$(date +%FT%T%:z):\t3bInstallIMAGEMAGICK\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t3bInstallIMAGEMAGICK\tSTART\n" >> "${logfile}" - sudo apt-get update >> ~/scripts/rclone_script/rclone_script-install.log - sudo apt-get --yes install imagemagick >> ~/scripts/rclone_script/rclone_script-install.log + sudo apt-get update >> "${logfile}" + sudo apt-get --yes install imagemagick >> "${logfile}" if [[ $? -eq 0 ]] then - printf "$(date +%FT%T%:z):\t3bInstallIMAGEMAGICK\tDONE\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t3bInstallIMAGEMAGICK\tDONE\n" >> "${logfile}" return 0 else - printf "$(date +%FT%T%:z):\t3bInstallIMAGEMAGICK\tERROR\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t3bInstallIMAGEMAGICK\tERROR\n" >> "${logfile}" return 1 fi } @@ -638,30 +639,30 @@ function 4RCLONE_SCRIPT () # 1 > errors while downloading function 4aGetRCLONE_SCRIPT () { - printf "$(date +%FT%T%:z):\t4aGetRCLONE_SCRIPT\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t4aGetRCLONE_SCRIPT\tSTART\n" >> "${logfile}" # create directory if necessary if [ ! -d ~/scripts/rclone_script ] then - mkdir ~/scripts/rclone_script >> ~/scripts/rclone_script/rclone_script-install.log + mkdir ~/scripts/rclone_script >> "${logfile}" fi { #try # get script files - wget -N -P ~/scripts/rclone_script ${url}/${branch}/rclone_script.sh --append-output=/home/pi/scripts/rclone_script/rclone_script-install.log && - wget -N -P ~/scripts/rclone_script ${url}/${branch}/rclone_script-menu.sh --append-output=/home/pi/scripts/rclone_script/rclone_script-install.log && - wget -N -P ~/scripts/rclone_script ${url}/${branch}/rclone_script-uninstall.sh --append-output=/home/pi/scripts/rclone_script/rclone_script-install.log && + wget -N -P ~/scripts/rclone_script ${url}/${branch}/rclone_script.sh --append-output="${logfile}" && + wget -N -P ~/scripts/rclone_script ${url}/${branch}/rclone_script-menu.sh --append-output="${logfile}" && + wget -N -P ~/scripts/rclone_script ${url}/${branch}/rclone_script-uninstall.sh --append-output="${logfile}" && # change mod - chmod +x ~/scripts/rclone_script/rclone_script.sh >> ~/scripts/rclone_script/rclone_script-install.log && - chmod +x ~/scripts/rclone_script/rclone_script-menu.sh >> ~/scripts/rclone_script/rclone_script-install.log && - chmod +x ~/scripts/rclone_script/rclone_script-uninstall.sh >> ~/scripts/rclone_script/rclone_script-install.log && + chmod +x ~/scripts/rclone_script/rclone_script.sh >> "${logfile}" && + chmod +x ~/scripts/rclone_script/rclone_script-menu.sh >> "${logfile}" && + chmod +x ~/scripts/rclone_script/rclone_script-uninstall.sh >> "${logfile}" && - printf "$(date +%FT%T%:z):\t4aGetRCLONE_SCRIPT\tDONE\n" >> ~/scripts/rclone_script/rclone_script-install.log && + printf "$(date +%FT%T%:z):\t4aGetRCLONE_SCRIPT\tDONE\n" >> "${logfile}" && return 0 } || { # catch - printf "$(date +%FT%T%:z):\t4aGetRCLONE_SCRIPT\tERROR\n" >> ~/scripts/rclone_script/rclone_script-install.log && + printf "$(date +%FT%T%:z):\t4aGetRCLONE_SCRIPT\tERROR\n" >> "${logfile}" && return 1 } @@ -673,15 +674,15 @@ function 4aGetRCLONE_SCRIPT () # 1 > error while creating menu item function 4bCreateRCLONE_SCRIPTMenuItem () { - printf "$(date +%FT%T%:z):\t4bCreateRCLONE_SCRIPTMenuItem\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t4bCreateRCLONE_SCRIPTMenuItem\tSTART\n" >> "${logfile}" # move menu script - mv --force ~/scripts/rclone_script/rclone_script-menu.sh ~/RetroPie/retropiemenu >> ~/scripts/rclone_script/rclone_script-install.log + mv --force ~/scripts/rclone_script/rclone_script-menu.sh ~/RetroPie/retropiemenu >> "${logfile}" # check if menu item exists if [[ $(xmlstarlet sel -t -v "count(/gameList/game[path='./rclone_script-menu.sh'])" ~/.emulationstation/gamelists/retropie/gamelist.xml) -eq 0 ]] then - printf "$(date +%FT%T%:z):\t4bCreateRCLONE_SCRIPTMenuItem\tNOT FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t4bCreateRCLONE_SCRIPTMenuItem\tNOT FOUND\n" >> "${logfile}" # sed -i "/<\/gameList>/c\\\\t\n\t\t.\/rclone_script-menu.sh<\/path>\n\t\tRCLONE_SCRIPT menu<\/name>\n\t\tCustomize RCLONE_SCRIPT, start a full sync, uninstall RCLONE_SCRIPT<\/desc>\n\t\t\n\t<\/game>\n<\/gameList>" ~/.emulationstation/gamelists/retropie/gamelist.xml @@ -695,14 +696,14 @@ function 4bCreateRCLONE_SCRIPTMenuItem () if [[ $? -eq 0 ]] then - printf "$(date +%FT%T%:z):\t4bCreateRCLONE_SCRIPTMenuItem\tCREATED\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t4bCreateRCLONE_SCRIPTMenuItem\tCREATED\n" >> "${logfile}" return 0 else - printf "$(date +%FT%T%:z):\t4bCreateRCLONE_SCRIPTMenuItem\tERROR\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t4bCreateRCLONE_SCRIPTMenuItem\tERROR\n" >> "${logfile}" return 1 fi else - printf "$(date +%FT%T%:z):\t4bCreateRCLONE_SCRIPTMenuItem\tFOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t4bCreateRCLONE_SCRIPTMenuItem\tFOUND\n" >> "${logfile}" return 0 fi } @@ -710,7 +711,7 @@ function 4bCreateRCLONE_SCRIPTMenuItem () # Gets user input to configure RCLONE_SCRIPT function 4cConfigureRCLONE_SCRIPT () { - printf "$(date +%FT%T%:z):\t4cConfigureRCLONE_SCRIPT\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t4cConfigureRCLONE_SCRIPT\tSTART\n" >> "${logfile}" remotebasedir=$(dialog \ --stdout \ @@ -739,7 +740,7 @@ function 4cConfigureRCLONE_SCRIPT () *) shownotifications="FALSE" ;; esac - printf "$(date +%FT%T%:z):\t4cConfigureRCLONE_SCRIPT\tDONE\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t4cConfigureRCLONE_SCRIPT\tDONE\n" >> "${logfile}" } function 5RUNCOMMAND () @@ -769,36 +770,36 @@ function 5RUNCOMMAND () # 1 > call created function 5aRUNCOMMAND-ONSTART () { - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tSTART\n" >> "${logfile}" # check if RUNCOMMAND-ONSTART.sh exists if [ -f /opt/retropie/configs/all/runcommand-onstart.sh ] then - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tFILE FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tFILE FOUND\n" >> "${logfile}" # check if there's a call to RCLONE_SCRIPT if grep -Fq "~/scripts/rclone_script/rclone_script.sh" /opt/retropie/configs/all/runcommand-onstart.sh then - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tCALL FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tCALL FOUND\n" >> "${logfile}" return 0 else - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tCALL NOT FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tCALL NOT FOUND\n" >> "${logfile}" # add call echo "~/scripts/rclone_script/rclone_script.sh \"down\" \"\$1\" \"\$2\" \"\$3\" \"\$4\"" >> /opt/retropie/configs/all/runcommand-onstart.sh - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tCALL CREATED\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tCALL CREATED\n" >> "${logfile}" return 1 fi else - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tFILE NOT FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tFILE NOT FOUND\n" >> "${logfile}" echo "#!/bin/bash" > /opt/retropie/configs/all/runcommand-onstart.sh echo "~/scripts/rclone_script/rclone_script.sh \"down\" \"\$1\" \"\$2\" \"\$3\" \"\$4\"" >> /opt/retropie/configs/all/runcommand-onstart.sh - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tFILE CREATED\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONSTART\tFILE CREATED\n" >> "${logfile}" return 1 fi @@ -810,36 +811,36 @@ function 5aRUNCOMMAND-ONSTART () # 1 > call created function 5aRUNCOMMAND-ONEND () { - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tSTART\n" >> "${logfile}" # check if RUNCOMMAND-ONEND.sh exists if [ -f /opt/retropie/configs/all/runcommand-onend.sh ] then - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tFILE FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tFILE FOUND\n" >> "${logfile}" # check if there's a call to RCLONE_SCRIPT if grep -Fq "~/scripts/rclone_script/rclone_script.sh" /opt/retropie/configs/all/runcommand-onend.sh then - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tCALL FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tCALL FOUND\n" >> "${logfile}" return 0 else - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tCALL NOT FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tCALL NOT FOUND\n" >> "${logfile}" # add call echo "~/scripts/rclone_script/rclone_script.sh \"up\" \"\$1\" \"\$2\" \"\$3\" \"\$4\"" >> /opt/retropie/configs/all/runcommand-onend.sh - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tCALL CREATED\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tCALL CREATED\n" >> "${logfile}" return 1 fi else - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tFILE NOT FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tFILE NOT FOUND\n" >> "${logfile}" echo "#!/bin/bash" > /opt/retropie/configs/all/runcommand-onend.sh echo "~/scripts/rclone_script/rclone_script.sh \"up\" \"\$1\" \"\$2\" \"\$3\" \"\$4\"" >> /opt/retropie/configs/all/runcommand-onend.sh - printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tFILE CREATED\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t5aRUNCOMMAND-ONEND\tFILE CREATED\n" >> "${logfile}" return 1 fi @@ -872,20 +873,20 @@ function 6LocalSAVEFILEDirectory () # 1 > directory has been created function 6aCheckLocalBaseDirectory () { - printf "$(date +%FT%T%:z):\t6aCheckLocalBaseDirectory\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t6aCheckLocalBaseDirectory\tSTART\n" >> "${logfile}" # check if local base dir exists if [ -d ~/RetroPie/saves ] then - printf "$(date +%FT%T%:z):\t6aCheckLocalBaseDirectory\tFOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t6aCheckLocalBaseDirectory\tFOUND\n" >> "${logfile}" return 0 else - printf "$(date +%FT%T%:z):\t6aCheckLocalBaseDirectory\tNOT FOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t6aCheckLocalBaseDirectory\tNOT FOUND\n" >> "${logfile}" mkdir ~/RetroPie/saves - printf "$(date +%FT%T%:z):\t6aCheckLocalBaseDirectory\tCREATED\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t6aCheckLocalBaseDirectory\tCREATED\n" >> "${logfile}" return 1 fi @@ -897,7 +898,7 @@ function 6aCheckLocalBaseDirectory () # 1 > created at least one function 6bCheckLocalSystemDirectories () { - printf "$(date +%FT%T%:z):\t6bCheckLocalSystemDirectories\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t6bCheckLocalSystemDirectories\tSTART\n" >> "${logfile}" local retval=0 # for each directory in ROMS directory... @@ -911,21 +912,21 @@ function 6bCheckLocalSystemDirectories () # check if same directory exists in SAVES, create if necessary if [ -d ~/RetroPie/saves/${system} ] then - printf "$(date +%FT%T%:z):\t6bCheckLocalSystemDirectories\tFOUND directory ${system}\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t6bCheckLocalSystemDirectories\tFOUND directory ${system}\n" >> "${logfile}" else mkdir ~/RetroPie/saves/${system} - printf "$(date +%FT%T%:z):\t6bCheckLocalSystemDirectories\tCREATED directory ${system}\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t6bCheckLocalSystemDirectories\tCREATED directory ${system}\n" >> "${logfile}" retval=1 fi else # check if same SymLink exists in SAVES, create if necessary if [ -L ~/RetroPie/saves/${system} ] then - printf "$(date +%FT%T%:z):\t6bCheckLocalSystemDirectories\tFOUND symlink ${system}\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t6bCheckLocalSystemDirectories\tFOUND symlink ${system}\n" >> "${logfile}" else ln -s $(readlink ~/RetroPie/roms/${system}) ~/RetroPie/saves/${system} - printf "$(date +%FT%T%:z):\t6bCheckLocalSystemDirectories\tCREATED symlink ${system}\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t6bCheckLocalSystemDirectories\tCREATED symlink ${system}\n" >> "${logfile}" retval=1 fi fi @@ -964,7 +965,7 @@ function 7RemoteSAVEFILEDirectory () # 255 > error while creating directory function 7aCheckRemoteBaseDirectory () { - printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tSTART\n" >> "${logfile}" # list all directories from remote remoteDirs=$(rclone lsf --dirs-only -R retropie:) @@ -974,20 +975,20 @@ function 7aCheckRemoteBaseDirectory () do if [ "${path}" == "${remotebasedir}/" ] then - printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tFOUND\n" >> ~/scripts/rclone_script/rclone_script-install.log + 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" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tNOT FOUND\n" >> "${logfile}" - rclone mkdir retropie:"${remotebasedir}" >> ~/scripts/rclone_script/rclone_script-install.log + rclone mkdir retropie:"${remotebasedir}" >> "${logfile}" case $? in - 0) printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tCREATED\n" >> ~/scripts/rclone_script/rclone_script-install.log; return 1 ;; - *) printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tERROR\n" >> ~/scripts/rclone_script/rclone_script-install.log; return 255 ;; + 0) printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tCREATED\n" >> "${logfile}"; return 1 ;; + *) printf "$(date +%FT%T%:z):\t7aCheckRemoteBaseDirectory\tERROR\n" >> "${logfile}"; return 255 ;; esac } @@ -998,7 +999,7 @@ function 7aCheckRemoteBaseDirectory () # 255 > error while creating directory function 7bCheckRemoteSystemDirectories () { - printf "$(date +%FT%T%:z):\t7bCheckRemoteSystemDirectories\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t7bCheckRemoteSystemDirectories\tSTART\n" >> "${logfile}" local retval=0 local output @@ -1021,7 +1022,7 @@ function 7bCheckRemoteSystemDirectories () if [[ $? -eq 0 ]] then - printf "$(date +%FT%T%:z):\t7bCheckRemoteSystemDirectories\tCREATED ${system}\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t7bCheckRemoteSystemDirectories\tCREATED ${system}\n" >> "${logfile}" # put note if local directory is a symlink if [ -L ~/RetroPie/saves/${system} ] @@ -1035,11 +1036,11 @@ function 7bCheckRemoteSystemDirectories () retval=1 else - printf "$(date +%FT%T%:z):\t7bCheckRemoteSystemDirectories\tERROR\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t7bCheckRemoteSystemDirectories\tERROR\n" >> "${logfile}" return 255 fi else - printf "$(date +%FT%T%:z):\t7bCheckRemoteSystemDirectories\tFOUND ${system}\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t7bCheckRemoteSystemDirectories\tFOUND ${system}\n" >> "${logfile}" fi done @@ -1059,7 +1060,7 @@ function 8ConfigureRETROARCH () # Sets parameters in all system specific configuration files function 8aSetLocalSAVEFILEDirectory () { - printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tSTART\n" >> "${logfile}" local retval @@ -1077,19 +1078,19 @@ function 8aSetLocalSAVEFILEDirectory () # test if there's a RETROARCH.CFG if [ -f "${directory}/retroarch.cfg" ] then - printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tFOUND retroarch.cfg FOR ${system}\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tFOUND retroarch.cfg FOR ${system}\n" >> "${logfile}" # test file for SAVEFILE_DIRECTORY retval=$(grep -i "^savefile_directory = " ${directory}/retroarch.cfg) if [ ! "${retval}" = "" ] then - printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tREPLACED savefile_directory\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tREPLACED savefile_directory\n" >> "${logfile}" # replace existing parameter sed -i "/^savefile_directory = /c\savefile_directory = \"~/RetroPie/saves/${system}\"" ${directory}/retroarch.cfg else - printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tADDED savefile_directory\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tADDED savefile_directory\n" >> "${logfile}" # create new parameter above "#include..." sed -i "/^#include \"\/opt\/retropie\/configs\/all\/retroarch.cfg\"/c\savefile_directory = \"~\/RetroPie\/saves\/${system}\"\n#include \"\/opt\/retropie\/configs\/all\/retroarch.cfg\"" ${directory}/retroarch.cfg @@ -1100,12 +1101,12 @@ function 8aSetLocalSAVEFILEDirectory () if [ ! "${retval}" = "" ] then - printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tREPLACED savestate_directory\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tREPLACED savestate_directory\n" >> "${logfile}" # replace existing parameter sed -i "/^savestate_directory = /c\savestate_directory = \"~/RetroPie/saves/${system}\"" ${directory}/retroarch.cfg else - printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tADDED savestate_directory\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tADDED savestate_directory\n" >> "${logfile}" # create new parameter above "#include..." sed -i "/^#include \"\/opt\/retropie\/configs\/all\/retroarch.cfg\"/c\savestate_directory = \"~\/RetroPie\/saves\/${system}\"\n#include \"\/opt\/retropie\/configs\/all\/retroarch.cfg\"" ${directory}/retroarch.cfg @@ -1114,7 +1115,7 @@ function 8aSetLocalSAVEFILEDirectory () fi done - printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tDONE\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t8aSetLocalSAVEFILEDirectory\tDONE\n" >> "${logfile}" } function 9Finalize () @@ -1130,14 +1131,14 @@ function 9Finalize () # Saves the configuration of RCLONE_SCRIPT function 9aSaveConfiguration () { - printf "$(date +%FT%T%:z):\t9aSaveConfiguration\tSTART\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t9aSaveConfiguration\tSTART\n" >> "${logfile}" echo "remotebasedir=${remotebasedir}" > ~/scripts/rclone_script/rclone_script.ini echo "shownotifications=${shownotifications}" >> ~/scripts/rclone_script/rclone_script.ini echo "logfile=~/scripts/rclone_script/rclone_script.log" >> ~/scripts/rclone_script/rclone_script.ini echo "debug=0" >> ~/scripts/rclone_script/rclone_script.ini - printf "$(date +%FT%T%:z):\t9aSaveConfiguration\tDONE\n" >> ~/scripts/rclone_script/rclone_script-install.log + printf "$(date +%FT%T%:z):\t9aSaveConfiguration\tDONE\n" >> "${logfile}" }