Merge pull request #2554 from joolswills/home_folders

Home folders
RetroPie · Dec 5, 2018 · 910e067 · 910e067
2 parents 2098a1c + 99b394a
commit 910e067
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 18 deletions.
diff --git a/scriptmodules/emulators/ppsspp.sh b/scriptmodules/emulators/ppsspp.sh
@@ -158,7 +158,6 @@ function install_ppsspp() {
 function configure_ppsspp() {
     mkRomDir "psp"
 
-    mkUserDir "$home/.config"
     moveConfigDir "$home/.config/ppsspp" "$md_conf_root/psp"
     mkUserDir "$md_conf_root/psp/PSP"
     ln -snf "$romdir/psp" "$md_conf_root/psp/PSP/GAME"

diff --git a/scriptmodules/emulators/residualvm.sh b/scriptmodules/emulators/residualvm.sh
@@ -62,11 +62,7 @@ function install_residualvm() {
 function configure_residualvm() {
     mkRomDir "residualvm"
 
-    local dir
+    moveConfigDir "$home/.config/residualvm" "$md_conf_root/residualvm"
-    for dir in .config .cache; do
-        mkUserDir "$home/$dir"
-        moveConfigDir "$home/$dir/residualvm" "$md_conf_root/residualvm"
-    done
 
     # Create startup script
     cat > "$romdir/residualvm/+Start ResidualVM.sh" << _EOF_

diff --git a/scriptmodules/emulators/retroarch.sh b/scriptmodules/emulators/retroarch.sh
@@ -117,7 +117,6 @@ function configure_retroarch() {
     [[ "$md_mode" == "remove" ]] && return
 
     # move / symlink the retroarch configuration
-    mkUserDir "$home/.config"
     moveConfigDir "$home/.config/retroarch" "$configdir/all/retroarch"
 
     # move / symlink our old retroarch-joypads folder

diff --git a/scriptmodules/emulators/scummvm.sh b/scriptmodules/emulators/scummvm.sh
@@ -62,9 +62,7 @@ function configure_scummvm() {
     mkRomDir "scummvm"
 
     local dir
-    mkUserDir "$home/.local"
+    for dir in .config .local/share; do
-    for dir in .config .local/share .cache; do
-        mkUserDir "$home/$dir"
         moveConfigDir "$home/$dir/scummvm" "$md_conf_root/scummvm"
     done
 

diff --git a/scriptmodules/emulators/stella.sh b/scriptmodules/emulators/stella.sh
@@ -38,7 +38,6 @@ function install_stella() {
 function configure_stella() {
     mkRomDir "atari2600"
 
-    mkUserDir "$home/.config"
     moveConfigDir "$home/.config/stella" "$md_conf_root/atari2600/stella"
 
     addEmulator 1 "$md_id" "atari2600" "$md_inst/bin/stella -maxres 320x240 -fullscreen 1 -tia.fsfill 1 %ROM%"

diff --git a/scriptmodules/helpers.sh b/scriptmodules/helpers.sh
@@ -383,6 +383,12 @@ function setupDirectories() {
     mkUserDir "$configdir"
     mkUserDir "$configdir/all"
 
+    # some home folders for configs that modules rely on
+    mkUserDir "$home/.cache"
+    mkUserDir "$home/.config"
+    mkUserDir "$home/.local"
+    mkUserDir "$home/.local/share"
+
     # make sure we have inifuncs.sh in place and that it is up to date
     mkdir -p "$rootdir/lib"
     local helper_libs=(inifuncs.sh archivefuncs.sh)

diff --git a/scriptmodules/ports/cdogs-sdl.sh b/scriptmodules/ports/cdogs-sdl.sh
@@ -44,7 +44,6 @@ function install_cdogs-sdl() {
 }
 
 function configure_cdogs-sdl() {
-    mkUserDir "$home/.config"
     moveConfigDir "$home/.config/cdogs-sdl" "$md_conf_root/cdogs-sdl"
     addPort "$md_id" "cdogs-sdl" "C-Dogs SDL" "pushd $md_inst; $md_inst/cdogs-sdl; popd"
 }
diff --git a/scriptmodules/ports/openblok.sh b/scriptmodules/ports/openblok.sh
@@ -34,8 +34,6 @@ function install_openblok() {
 }
 
 function configure_openblok() {
-    mkUserDir "$home/.local"
-    mkUserDir "$home/.local/share"
     moveConfigDir "$home/.local/share/openblok" "$md_conf_root/openblok"
     addPort "$md_id" "openblok" "OpenBlok" "$md_inst/openblok"
 }
diff --git a/scriptmodules/ports/openttd.sh b/scriptmodules/ports/openttd.sh
@@ -30,9 +30,7 @@ function remove_openttd() {
 
 function configure_openttd() {
     local dir
-    mkUserDir "$home/.local"
     for dir in .config .local/share; do
-        mkUserDir "$home/$dir"
         moveConfigDir "$home/$dir/openttd" "$md_conf_root/openttd"
     done
 

diff --git a/scriptmodules/ports/zdoom.sh b/scriptmodules/ports/zdoom.sh
@@ -52,7 +52,6 @@ function add_games_zdoom() {
 function configure_zdoom() {
     mkRomDir "ports/doom"
 
-    mkUserDir "$home/.config"
     moveConfigDir "$home/.config/zdoom" "$md_conf_root/doom"
 
     [[ "$md_mode" == "install" ]] && game_data_lr-prboom

diff --git a/scriptmodules/supplementary/mehstation.sh b/scriptmodules/supplementary/mehstation.sh
@@ -102,7 +102,6 @@ function install_mehstation() {
 
 function configure_mehstation() {
     # move / symlink the configuration
-    mkUserDir "$home/.config"
     moveConfigDir "$home/.config/mehstation" "$md_conf_root/all/mehstation"
 
     local db="$md_conf_root/all/mehstation/database.db"