diff --git a/config/steam-rom-manager/userConfigurations.json b/config/steam-rom-manager/userConfigurations.json index 150a5b8a..94243acf 100644 --- a/config/steam-rom-manager/userConfigurations.json +++ b/config/steam-rom-manager/userConfigurations.json @@ -2,22 +2,20 @@ { "parserType": "Glob", "configTitle": "RetroDECK", - "steamDirectory": "", + "steamDirectory": "${steamdirglobal}", "steamCategory": "RetroDECK", - "romDirectory": "", + "romDirectory": "${romsdirglobal}", "executableArgs": "", "executableModifier": "\"${exePath}\"", "startInDirectory": "", "titleModifier": "${fuzzyTitle}", - "fetchControllerTemplatesButton": null, - "removeControllersButton": null, "imageProviders": [ "SteamGridDB" ], "onlineImageQueries": "${${fuzzyTitle}}", "imagePool": "${fuzzyTitle}", "userAccounts": { - "specifiedAccounts": null + "specifiedAccounts": "" }, "executable": { "path": "", @@ -25,7 +23,7 @@ "appendArgsToExecutable": true }, "parserInputs": { - "glob": "${title}@(.sh)" + "glob": "${title}.sh" }, "titleFromVariable": { "limitToGroups": "", diff --git a/config/steam-rom-manager/userSettings.json b/config/steam-rom-manager/userSettings.json new file mode 100644 index 00000000..0eeebea6 --- /dev/null +++ b/config/steam-rom-manager/userSettings.json @@ -0,0 +1,30 @@ +{ + "fuzzyMatcher": { + "verbose": false, + "filterProviders": true + }, + "environmentVariables": { + "steamDirectory": "", + "userAccounts": "${steamlogin}", + "romsDirectory": "", + "retroarchPath": "", + "raCoresDirectory": "", + "localImagesDirectory": "" + }, + "previewSettings": { + "retrieveCurrentSteamImages": true, + "deleteDisabledShortcuts": false, + "imageZoomPercentage": 30, + "preload": false + }, + "enabledProviders": [ + "SteamGridDB" + ], + "batchDownloadSize": 50, + "language": "en-US", + "theme": "Deck", + "offlineMode": false, + "navigationWidth": 0, + "clearLogOnTest": false, + "version": 6 +} diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 05c127bb..d2cec976 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -90,10 +90,9 @@ prepare_component() { create_dir -d $srm_path cp -fv "$config/steam-rom-manager/"*.json $srm_path - log i "Updating steamDirectory and romDirectory lines in $srm_path/userConfigurations.json" - jq --arg steamDir "$HOME/.steam/steam" --arg romDir "$rdhome/.sync" \ - '.[0].steamDirectory = $steamDir | .[0].romDirectory = $romDir' \ - "$srm_path/userConfigurations.json" > tmpfile && mv tmpfile "$srm_path/userConfigurations.json" + log i "Updating steamDirectory and romDirectory lines in $srm_path/userSettings.json" + jq '.environmentVariables.steamDirectory = "'$HOME'/.steam/steam"' $srm_path/userSettings.json" > tmp.json && mv tmp.json $srm_path/userSettings.json" + jq '.environmentVariables.romsDirectory = "'$rdhome'/.sync"' $srm_path/userSettings.json > tmp.json && mv tmp.json $srm_path/userSettings.json fi if [[ "$component" =~ ^(retroarch|all)$ ]]; then