From db7e1be6bcd109005d8725e9fc1fc91d1eab552b Mon Sep 17 00:00:00 2001 From: Rudis Muiznieks Date: Thu, 8 Feb 2024 08:40:55 -0600 Subject: [PATCH] updates for nds and new rom paths --- .gitignore | 1 + DOOM.lpl | 14 ++++---------- gen-playlist.sh | 33 +++++++++++++++++++++++---------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 989b5a5..2fe7378 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +out/ *.lpl diff --git a/DOOM.lpl b/DOOM.lpl index 6123098..6f3c6c4 100644 --- a/DOOM.lpl +++ b/DOOM.lpl @@ -1,6 +1,6 @@ { "version": "1.5", - "default_core_path": "/tmp/cores/prboom_libretro.so", + "default_core_path": "$CORE_PREFIX/prboom_libretro.so", "default_core_name": "Doom (PrBoom)", "label_display_mode": 0, "right_thumbnail_mode": 0, @@ -8,26 +8,20 @@ "sort_mode": 0, "items": [ { - "path": "/storage/roms/dooms/doom/doom.wad", + "path": "$ROM_PREFIX/prboom/doom.wad", "label": "Doom", - "core_path": "/tmp/cores/prboom_libretro.so", - "core_name": "Doom (PrBoom)", "crc32": "DETECT", "db_name": "DOOM.lpl" }, { - "path": "/storage/roms/dooms/doom2/doom2.wad", + "path": "$ROM_PREFIX/prboom/doom2.wad", "label": "Doom II - Hell on Earth", - "core_path": "/tmp/cores/prboom_libretro.so", - "core_name": "Doom (PrBoom)", "crc32": "DETECT", "db_name": "DOOM.lpl" }, { - "path": "/storage/roms/dooms/finaldoom/plutonia.wad", + "path": "$ROM_PREFIX/prboom/plutonia.wad", "label": "Final Doom - The Plutonia Experiment", - "core_path": "/tmp/cores/prboom_libretro.so", - "core_name": "Doom (PrBoom)", "crc32": "DETECT", "db_name": "DOOM.lpl" } diff --git a/gen-playlist.sh b/gen-playlist.sh index e3863dd..b120212 100755 --- a/gen-playlist.sh +++ b/gen-playlist.sh @@ -18,13 +18,13 @@ case "$sys_type" in core_name="Atari - 2600 (Stella)" db_name="Atari - 2600.lpl" ;; - 'atarilynx') + 'lynx') rom_ext="lnx" core_path="$CORE_PREFIX/handy_libretro.so" core_name="Atari - Lynx (Handy)" db_name="Atari - Lynx.lpl" ;; - 'arcade') + 'mame') rom_ext="zip" core_path="$CORE_PREFIX/mame2003_plus_libretro.so" core_name="Arcade (MAME 2003-Plus)" @@ -102,25 +102,37 @@ case "$sys_type" in core_name="Sony - PlayStation Portable (PPSSPP)" db_name="Sony - PlayStation Portable.lpl" ;; - 'ws') + 'wswan') rom_ext="ws" core_path="$CORE_PREFIX/mednafen_wswan_libretro.so" core_name="Bandai - WonderSwan (Beetle Cygne)" db_name="Bandai - WonderSwan.lpl" ;; - 'wsc') + 'wswanc') rom_ext="wsc" core_path="$CORE_PREFIX/mednafen_wswan_libretro.so" core_name="Bandai - WonderSwan Color (Beetle Cygne)" db_name="Bandai - WonderSwan Color.lpl" ;; + 'nds') + rom_ext="nds" + core_path="$CORE_PREFIX/desmume_libretro.so" + core_name="Nintendo - DS (DeSmuME)" + db_name="Nintendo - Nintendo DS.lpl" + ;; + 'prboom') + # special case, use template + echo 'Generating DOOM.lpl from template...' + sed "s|\\\$CORE_PREFIX|$CORE_PREFIX|g" DOOM.lpl | sed "s|\\\$ROM_PREFIX|$ROM_PREFIX|g" > out/DOOM.lpl + exit 0 + ;; *) echo "Don't recognize system for roms in $sys_type directory..." exit 1 ;; esac -cat > temp.json < out/temp.json < temp.json <> temp.json <> out/temp.json <> temp.json <> out/temp.json < "$db_name"; then - rm temp.json +if jq . out/temp.json > "out/$db_name"; then + rm out/temp.json fi