diff --git a/rclone_script-install.sh b/rclone_script-install.sh index 063b124..2fc95bb 100644 --- a/rclone_script-install.sh +++ b/rclone_script-install.sh @@ -676,20 +676,19 @@ function 4bCreateRCLONE_SCRIPTMenuItem () { printf "$(date +%FT%T%:z):\t4bCreateRCLONE_SCRIPTMenuItem\tSTART\n" >> "${logfile}" - # move menu script - mv --force ~/scripts/rclone_script/rclone_script-menu.sh ~/RetroPie/retropiemenu >> "${logfile}" + # create redirect script + printf "#!/bin/bash\n~/scripts/rclone_script/rclone_script-menu.sh" > ~/RetroPie/retropiemenu/rclone_script-redirect.sh + chmod +x ~/RetroPie/retropiemenu/rclone_script-redirect.sh # 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 ]] + if [[ $(xmlstarlet sel -t -v "count(/gameList/game[path='./rclone_script-redirect.sh'])" ~/.emulationstation/gamelists/retropie/gamelist.xml) -eq 0 ]] then 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 - + xmlstarlet ed \ --inplace \ --subnode "/gameList" --type elem -n game -v "" \ - --subnode "/gameList/game[last()]" --type elem -n path -v "./rclone_script-menu.sh" \ + --subnode "/gameList/game[last()]" --type elem -n path -v "./rclone_script-redirect.sh" \ --subnode "/gameList/game[last()]" --type elem -n name -v "RCLONE_SCRIPT menu" \ --subnode "/gameList/game[last()]" --type elem -n desc -v "Launches a menu allowing you to start a full sync, configure RCLONE_SCRIPT or even uninstall it" \ ~/.emulationstation/gamelists/retropie/gamelist.xml diff --git a/rclone_script-uninstall.sh b/rclone_script-uninstall.sh index ea79f63..0d1a738 100644 --- a/rclone_script-uninstall.sh +++ b/rclone_script-uninstall.sh @@ -357,7 +357,7 @@ function 4RCLONE_SCRIPT () local found=0 - if [[ $(xmlstarlet sel -t -v "count(/gameList/game[path='./rclone_script-menu.sh'])" ~/.emulationstation/gamelists/retropie/gamelist.xml) -ne 0 ]] + if [[ $(xmlstarlet sel -t -v "count(/gameList/game[path='./rclone_script-redirect.sh.sh'])" ~/.emulationstation/gamelists/retropie/gamelist.xml) -ne 0 ]] then found=$(($found + 1)) @@ -365,7 +365,7 @@ function 4RCLONE_SCRIPT () xmlstarlet ed \ --inplace \ - --delete "//game[path='./rclone_script-menu.sh']" \ + --delete "//game[path='./rclone_script-redirect.sh']" \ ~/.emulationstation/gamelists/retropie/gamelist.xml printf "$(date +%FT%T%:z):\t4bRCLONE_SCRIPTMenuItem\tREMOVED\n" >> "${logfile}" @@ -373,13 +373,14 @@ function 4RCLONE_SCRIPT () printf "$(date +%FT%T%:z):\t4bRCLONE_SCRIPTMenuItem\tNOT FOUND\n" >> "${logfile}" fi - if [ -f ~/RetroPie/retropiemenu/rclone_script-menu.sh ] + if [ -f ~/RetroPie/retropiemenu/rclone_script-redirect.sh ] then found=$(($found + 1)) printf "$(date +%FT%T%:z):\t4bRCLONE_SCRIPTMenuItemScript\tFOUND\n" >> "${logfile}" - sudo rm ~/RetroPie/retropiemenu/rclone_script-menu.sh >> "${logfile}" + sudo rm ~/RetroPie/retropiemenu/rclone_script-redirect.sh >> "${logfile}" + sudo rm ~/scripts/rclone_script/rclone_script-menu.sh >> "${logfile}" printf "$(date +%FT%T%:z):\t4bRCLONE_SCRIPTMenuItemScript\tREMOVED\n" >> "${logfile}" else