From 72f90f1205e880dfa9f056c43867c006280a3669 Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Thu, 24 Oct 2019 13:18:24 -0400 Subject: [PATCH] fix paths for new filesystem layout --- applications/xprofile | 2 +- games/eternity.cfg | 2 +- games/eternity_system.cfg | 22 +++++++++++----------- games/lutris/system.yml | 2 +- games/mupen64plus.cfg | 4 ++-- games/rpcs3.yml | 10 +++++----- network/motsognir.conf | 2 +- virtual-machines/MacEmu/OS7 | 2 +- virtual-machines/MacEmu/OS9 | 2 +- virtual-machines/MacEmu/common | 2 +- virtual-machines/MacEmu/common-m68k | 2 +- virtual-machines/MacEmu/common-ppc | 2 +- virtual-machines/NeXT/2.2 | 6 +++--- virtual-machines/QEMU/vm-qemu | 4 ++-- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/applications/xprofile b/applications/xprofile index 0b85268..d85877d 100644 --- a/applications/xprofile +++ b/applications/xprofile @@ -11,7 +11,7 @@ export KRITA_NO_STYLE_OVERRIDE=1 # misc export PATH=$HOME/.local/bin:$HOME/.gem/ruby/2.6.0/bin:$PATH -export DOOMWADDIR=/mnt/s/games/doom/iwads +export DOOMWADDIR=/media/store/games/doom/iwads export EDITOR=vim # run user startup jobs diff --git a/games/eternity.cfg b/games/eternity.cfg index a526543..49343e6 100644 --- a/games/eternity.cfg +++ b/games/eternity.cfg @@ -571,7 +571,7 @@ mn_classic_menus 0 mn_background "FWATER1" [(".")] user's default wad directory -wad_directory "/mnt/d/PWads" +wad_directory "/media/store/games/doom/pwads" [0-1(1)] 0 = normal, 1 = optimized quad cache r_columnengine 1 diff --git a/games/eternity_system.cfg b/games/eternity_system.cfg index 31e3030..4dafb1d 100644 --- a/games/eternity_system.cfg +++ b/games/eternity_system.cfg @@ -19,22 +19,22 @@ iwad_doom_shareware "" iwad_doom "" [("")] IWAD path for The Ultimate DOOM -iwad_ultimate_doom "/mnt/s/games/doom/iwads/doom.wad" +iwad_ultimate_doom "/media/store/games/doom/iwads/doom.wad" [("")] IWAD path for DOOM 2 -iwad_doom2 "/mnt/s/games/doom/iwads/doom2.wad" +iwad_doom2 "/media/store/games/doom/iwads/doom2.wad" [("")] IWAD path for DOOM 2, BFG Edition iwad_bfgdoom2 "" [("")] IWAD path for Final DOOM: TNT - Evilution -iwad_tnt "/mnt/s/games/doom/iwads/tnt.wad" +iwad_tnt "/media/store/games/doom/iwads/tnt.wad" [("")] IWAD path for Final DOOM: The Plutonia Experiment -iwad_plutonia "/mnt/s/games/doom/iwads/plutonia.wad" +iwad_plutonia "/media/store/games/doom/iwads/plutonia.wad" [("")] IWAD path for HACX - Twitch 'n Kill (v1.2 or later) -iwad_hacx "/mnt/s/games/doom/iwads/hacx.wad" +iwad_hacx "/media/store/games/doom/iwads/hacx.wad" [("")] IWAD path for Heretic Shareware iwad_heretic_shareware "" @@ -43,13 +43,13 @@ iwad_heretic_shareware "" iwad_heretic "" [("")] IWAD path for Heretic: Shadow of the Serpent Riders -iwad_heretic_sosr "/mnt/s/games/doom/iwads/heretic.wad" +iwad_heretic_sosr "/media/store/games/doom/iwads/heretic.wad" [("")] IWAD path for Freedoom (Doom 2 gamemission) -iwad_freedoom "/mnt/s/games/doom/iwads/freedoom2.wad" +iwad_freedoom "/media/store/games/doom/iwads/freedoom2.wad" [("")] IWAD path for Freedoom (Ultimate Doom gamemission) -iwad_freedoomu "/mnt/s/games/doom/iwads/freedoom1.wad" +iwad_freedoomu "/media/store/games/doom/iwads/freedoom1.wad" [("")] IWAD path for FreeDM (Freedoom Deathmatch IWAD) iwad_freedm "" @@ -58,13 +58,13 @@ iwad_freedm "" iwad_rekkr "" [-1-15(-1)] Number of last IWAD chosen from the IWAD picker -iwad_choice 2 +iwad_choice 3 [("")] Directory containing Master Levels wad files -master_levels_dir "/mnt/s/games/doom/iwads/master" +master_levels_dir "/media/store/games/doom/iwads/master" [("")] Path to 'No Rest for the Living' -w_norestpath "/mnt/s/games/doom/iwads/nerve.wad" +w_norestpath "/media/store/games/doom/iwads/nerve.wad" [0-1(0)] Start up ETERNITY in text mode textmode_startup 1 diff --git a/games/lutris/system.yml b/games/lutris/system.yml index f69dde2..18871a3 100644 --- a/games/lutris/system.yml +++ b/games/lutris/system.yml @@ -1,2 +1,2 @@ system: - game_path: /mnt/s/games + game_path: /media/store/games diff --git a/games/mupen64plus.cfg b/games/mupen64plus.cfg index ce47ac2..3d7b1a8 100644 --- a/games/mupen64plus.cfg +++ b/games/mupen64plus.cfg @@ -48,9 +48,9 @@ CurrentStateSlot = 0 # Path to directory where screenshots are saved. If this is blank, the default value of ${UserDataPath}/screenshot will be used ScreenshotPath = "" # Path to directory where emulator save states (snapshots) are saved. If this is blank, the default value of ${UserDataPath}/save will be used -SaveStatePath = "/mnt/d/Stuff/GameState/N64" +SaveStatePath = "/media/wind/Stuff/GameState/N64" # Path to directory where SRAM/EEPROM data (in-game saves) are stored. If this is blank, the default value of ${UserDataPath}/save will be used -SaveSRAMPath = "/mnt/d/Stuff/GameState/N64" +SaveSRAMPath = "/media/wind/Stuff/GameState/N64" # Path to a directory to search when looking for shared data files SharedDataPath = "" # Force number of cycles per emulated instruction diff --git a/games/rpcs3.yml b/games/rpcs3.yml index 9aa611e..b622f5a 100644 --- a/games/rpcs3.yml +++ b/games/rpcs3.yml @@ -31,11 +31,11 @@ Core: Clocks scale: 100 Sleep Timers Accuracy: Usleep Only VFS: - $(EmulatorDir): /mnt/d/Stuff/Games/PS3/ - /dev_hdd0/: /mnt/d/Stuff/Games/PS3/dev_hdd0/ - /dev_hdd1/: /mnt/d/Stuff/Games/PS3/dev_hdd1/ + $(EmulatorDir): /media/wind/Stuff/Games/PS3/ + /dev_hdd0/: /media/wind/Stuff/Games/PS3/dev_hdd0/ + /dev_hdd1/: /media/wind/Stuff/Games/PS3/dev_hdd1/ /dev_flash/: "" - /dev_usb000/: /mnt/d/Stuff/Games/PS3/dev_usb000/ + /dev_usb000/: /media/wind/Stuff/Games/PS3/dev_usb000/ /dev_bdvd/: "" /app_home/: "" Enable /host_root/: false @@ -148,4 +148,4 @@ Miscellaneous: Use native user interface: true GDB Server: 127.0.0.1:2345 Port: 2345 -Log: {} \ No newline at end of file +Log: {} diff --git a/network/motsognir.conf b/network/motsognir.conf index 37925f9..b99fb27 100644 --- a/network/motsognir.conf +++ b/network/motsognir.conf @@ -3,7 +3,7 @@ GopherPort=70 bind= disableipv6=0 GopherRoot=/srv/gopher/ -PubDirList=/mnt/d/Stuff/Books:/mnt/d/Stuff/Games:/mnt/s/music/shared:/mnt/s/osmedia +PubDirList=/media/wind/Stuff/Books:/media/wind/Stuff/Games:/media/store/music/shared:/media/store/osmedia UserDir= chroot= ParanoidMode=0 diff --git a/virtual-machines/MacEmu/OS7 b/virtual-machines/MacEmu/OS7 index 450a21b..6c9e6d0 100644 --- a/virtual-machines/MacEmu/OS7 +++ b/virtual-machines/MacEmu/OS7 @@ -1 +1 @@ -disk /mnt/s/vm/MacEmu/OS7 +disk /media/store/vm/MacEmu/OS7 diff --git a/virtual-machines/MacEmu/OS9 b/virtual-machines/MacEmu/OS9 index 3a6d757..752c0dc 100644 --- a/virtual-machines/MacEmu/OS9 +++ b/virtual-machines/MacEmu/OS9 @@ -1 +1 @@ -disk /mnt/s/vm/MacEmu/OS9 +disk /media/store/vm/MacEmu/OS9 diff --git a/virtual-machines/MacEmu/common b/virtual-machines/MacEmu/common index 321487c..8ebcc59 100644 --- a/virtual-machines/MacEmu/common +++ b/virtual-machines/MacEmu/common @@ -2,7 +2,7 @@ bootdrive 0 bootdriver 0 dsp /dev/dsp ether enp1s0 -extfs /mnt/s/vm/MacEmu/Share +extfs /media/store/vm/MacEmu/Share frameskip 1 ignoresegv false jit true diff --git a/virtual-machines/MacEmu/common-m68k b/virtual-machines/MacEmu/common-m68k index d335fd9..0c1abce 100644 --- a/virtual-machines/MacEmu/common-m68k +++ b/virtual-machines/MacEmu/common-m68k @@ -9,6 +9,6 @@ jitinline true jitlazyflush true modelid 5 ramsize 67108864 -rom /mnt/s/osmedia/Apple MacOS/ROMs OldWorld/512KB ROMs/1989-09 - 368CADFE - Mac IIci.ROM +rom /media/store/osmedia/Apple MacOS/ROMs OldWorld/512KB ROMs/1989-09 - 368CADFE - Mac IIci.ROM udpport 6066 udptunnel false diff --git a/virtual-machines/MacEmu/common-ppc b/virtual-machines/MacEmu/common-ppc index cdf1cad..7748403 100644 --- a/virtual-machines/MacEmu/common-ppc +++ b/virtual-machines/MacEmu/common-ppc @@ -3,6 +3,6 @@ idlewait true ignoreillegal false jit68k false ramsize 1073741824 -rom /mnt/s/osmedia/Apple MacOS/ROMs NewWorld/1999-05-14 - Mac OS ROM 1.6.rom +rom /media/store/osmedia/Apple MacOS/ROMs NewWorld/1999-05-14 - Mac OS ROM 1.6.rom screenmodes 0 windowmodes 0 diff --git a/virtual-machines/NeXT/2.2 b/virtual-machines/NeXT/2.2 index f1476ff..d79cc4e 100644 --- a/virtual-machines/NeXT/2.2 +++ b/virtual-machines/NeXT/2.2 @@ -9,15 +9,15 @@ nMemoryBankSize3 = 16 nMemorySpeed = 1 [HardDisk] -szImageName0 = /mnt/s/vm/NeXTEmu/image2.2 +szImageName0 = /media/store/vm/NeXTEmu/image2.2 nDeviceType0 = 1 bDiskInserted0 = true bWriteProtected0 = false -szImageName1 = /mnt/s/vm/NeXTEmu/boot2.2 +szImageName1 = /media/store/vm/NeXTEmu/boot2.2 nDeviceType1 = 3 bDiskInserted1 = true bWriteProtected1 = false -szImageName2 = /mnt/s/vm/NeXTEmu/install2.2 +szImageName2 = /media/store/vm/NeXTEmu/install2.2 nDeviceType2 = 2 bDiskInserted2 = true bWriteProtected2 = false diff --git a/virtual-machines/QEMU/vm-qemu b/virtual-machines/QEMU/vm-qemu index cc511a7..0409e93 100755 --- a/virtual-machines/QEMU/vm-qemu +++ b/virtual-machines/QEMU/vm-qemu @@ -46,11 +46,11 @@ and set ver $_flag_version or set ver $_ver # Disk Media -set image "/mnt/s/vm/$cfg/image$ver" +set image "/media/store/vm/$cfg/image$ver" set boot_order c # Install Media -set media "/mnt/s/osmedia" +set media "/media/store/osmedia" set install (string replace "_ver_" "$ver" "$_install") set boot (string replace "_ver_" "$ver" "$_boot")