Merge pull request #432 from icenine451/cooker-0.7.1b-icenine451

Make slash / underscore use more consistent

functions/functions.sh

@@ -464,7 +464,7 @@ install_retrodeck_controller_profile() {
   # BIGGER NOTE: As part of this process, all emulators will need to have their configs hard-reset to match the controller mappings of the profile
   # USAGE: install_retrodeck_controller_profile
   if [[ -d "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" && -d "$HOME/.steam/steam/controller_base/templates/" ]]; then
-    rsync -rlD "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/"
+    rsync -rlD "/app/retrodeck/binding_icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/"
     cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
   else
     configurator_generic_dialog "RetroDECK Controller Profile Install" "The target directories for the controller profile do not exist.\n\nThis may happen if you do not have Steam installed or the location is does not have permission to be read."

functions/global.sh

@@ -25,7 +25,7 @@ zip_compressable_extensions="$emuconfigs/defaults/retrodeck/reference_lists/zip_
 easter_egg_checklist="$emuconfigs/defaults/retrodeck/reference_lists/easter_egg_checklist.cfg"                        # A config file listing days and times when special splash screens should show up
 input_validation="$emuconfigs/defaults/retrodeck/reference_lists/input_validation.cfg"                                # A config file listing valid CLI inputs
 finit_options_list="$emuconfigs/defaults/retrodeck/reference_lists/finit_options_list.cfg"                            # A config file listing available optional installs during finit
-splashscreen_dir="/var/config/emulationstation/.emulationstation/resources/graphics/extra-splashes"                   # The default location of extra splash screens
+splashscreen_dir="/var/config/emulationstation/.emulationstation/resources/graphics/extra_splashes"                   # The default location of extra splash screens
 current_splash_file="/var/config/emulationstation/.emulationstation/resources/graphics/splash.svg"                    # The active splash file that will be shown on boot
 default_splash_file="/var/config/emulationstation/.emulationstation/resources/graphics/splash-orig.svg"               # The default RetroDECK splash screen
 multi_user_data_folder="$rdhome/multi-user-data"                                                                      # The default location of multi-user environment profiles

net.retrodeck.retrodeck.yml

@@ -1139,9 +1139,9 @@ modules:
       - mv -f -t ${FLATPAK_DEST}/retrodeck /app/share/emulationstation/resources/graphics
       - cp -f res/splash.svg ${FLATPAK_DEST}/retrodeck/graphics/splash.svg
       - cp -f res/splash.svg ${FLATPAK_DEST}/retrodeck/graphics/splash-orig.svg
-      - cp -rf res/extra-splashes/ ${FLATPAK_DEST}/retrodeck/graphics
+      - cp -rf res/extra_splashes/ ${FLATPAK_DEST}/retrodeck/graphics
       - cp -f res/icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg
-      - mv -f -t ${FLATPAK_DEST}/retrodeck res/binding-icons
+      - mv -f -t ${FLATPAK_DEST}/retrodeck res/binding_icons
 
       # RetroDECK core script
       - cp retrodeck.sh /app/bin/retrodeck.sh