diff --git a/export.sh b/export.sh index 24edfc76..566fdc59 100644 --- a/export.sh +++ b/export.sh @@ -24,7 +24,7 @@ function checkSpace(){ local difference=$(($freeSpace - $neededSpace)) if [[ $difference -lt 0 ]]; then - text="$(printf "Make sure you have enought space in $destination. You need to have at least $neededSpaceInHuman available")" + text="$(printf "Make sure you have enough space in $destination. You need to have at least $neededSpaceInHuman available")" zenity --question \ --title="EmuDeck Export tool" \ --width=450 \ @@ -130,28 +130,28 @@ if [ "$size" -gt 4096 ]; then fi fi - if [ -d "$emulationPath/bios" ]; then - text="$(printf "Do you want to export all your bios?")" + if [ -d "$emulationPath/roms" ]; then + text="$(printf "Do you want to export all your roms?")" zenity --question \ --title="EmuDeck Export tool" \ --width=450 \ --cancel-label="No" \ - --ok-label="Export my bios" \ + --ok-label="Export my roms" \ --text="${text}" 2>/dev/null ans=$? if [ $ans -eq 0 ]; then - checkSpace "$emulationPath/bios/" "$destination" + checkSpace "$emulationPath/roms/" "$destination" - mkdir -p "$destination/EmuDeck/bios" + mkdir -p "$destination/EmuDeck/roms" - for entry in "$emulationPath/bios/"* + for entry in "$emulationPath/roms/"* do - rsync -ravL --ignore-existing --progress "$entry" "$destination/EmuDeck/bios/" | awk -f $emudeckBackend/rsync.awk | zenity --progress --text="Exporting $entry to $destination/EmuDeck/bios/" --title="Exporting $entry..." --width=400 --percentage=0 --auto-close + rsync -ravL --ignore-existing --progress "$entry" "$destination/EmuDeck/roms/" | awk -f $HOME/.config/EmuDeck/backend/rsync.awk | zenity --progress --text="Exporting $entry to $destination/EmuDeck/roms/" --title="Exporting $entry..." --width=400 --percentage=0 --auto-close done else - echo "no bios" + echo "no roms" fi fi @@ -172,11 +172,11 @@ if [ "$size" -gt 4096 ]; then for entry in "$ESDEscrapData/"* do - rsync -ravL --ignore-existing --progress "$entry" "$destination/EmuDeck/roms/" | awk -f $emudeckBackend/rsync.awk | zenity --progress --text="Exporting $entry to $destination/EmuDeck/tools/downloaded_media/" --title="Exporting $entry..." --width=400 --percentage=0 --auto-close + rsync -ravL --ignore-existing --progress "$entry" "$destination/EmuDeck/tools/downloaded_media/" | awk -f $HOME/.config/EmuDeck/backend/rsync.awk | zenity --progress --text="Exporting $entry to $destination/EmuDeck/tools/downloaded_media/" --title="Exporting $entry..." --width=400 --percentage=0 --auto-close done else - echo "no roms" + echo "no media" fi fi @@ -194,4 +194,4 @@ else --ok-label="Bye" \ --text="${text}" -fi \ No newline at end of file +fi diff --git a/functions/EmuScripts/emuDeckBigPEmu.sh b/functions/EmuScripts/emuDeckBigPEmu.sh index fbd45948..38e5ea74 100644 --- a/functions/EmuScripts/emuDeckBigPEmu.sh +++ b/functions/EmuScripts/emuDeckBigPEmu.sh @@ -2,7 +2,6 @@ #variables BigPEmu_emuName="BigPEmu" BigPEmu_emuType="$emuDeckEmuTypeWindows" - BigPEmu_emuPath="$emusFolder/BigPEmu/bigpemu" BigPEmu_appData="$emusFolder/BigPEmu/UserData" BigPEmu_BigPEmuSettings="$emusFolder/BigPEmu/UserData/BigPEmuConfig.bigpcfg" @@ -52,9 +51,7 @@ BigPEmu_install(){ #ApplyInitialSettings BigPEmu_init(){ setMSG "Initializing $BigPEmu_emuName settings." - rsync -avhp "$emudeckBackend/configs/bigpemu/" "$BigPEmu_appData" --backup --suffix=.bak - sed -E -i "s|/run/media/mmcblk0p1/Emulation|$emulationPath|g" "$BigPEmu_BigPEmuSettings" BigPEmu_setEmulationFolder BigPEmu_setupSaves @@ -71,9 +68,7 @@ BigPEmu_init(){ #update BigPEmu_update(){ setMSG "Updating $BigPEmu_emuName settings." - rsync -avhp "$emudeckBackend/configs/bigpemu/" "$BigPEmu_appData" --ignore-existing - sed -E -i "s|/run/media/mmcblk0p1/Emulation|$emulationPath|g" "$BigPEmu_BigPEmuSettings" BigPEmu_setEmulationFolder BigPEmu_setupSaves