fixes and cleanups for gamesaver

diff --git a/scripts/customize/fred/scripts/games/gamesaver.sh b/scripts/customize/fred/scripts/games/gamesaver.sh
index bc71a02be2c96d2b37f8ee49e78dc03f35c0a48c..02401f1372e050cda679208d250beb06def2a434 100644 (file)
--- a/scripts/customize/fred/scripts/games/gamesaver.sh
+++ b/scripts/customize/fred/scripts/games/gamesaver.sh
@@ -6,13 +6,14 @@
 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 WINE_GOODS_DIR="$HOME/wine_goods"
-WINE_SOURCE_DIR="$WINE_GOODS_DIR/My Games"
+if [ ! -d "$WINE_GOODS_DIR" ]; then
+  WINE_GOODS_DIR="/cygdrive/c/users/fred/My Documents"
+fi
+
+WINE_GAMES_DIR="$WINE_GOODS_DIR/My Games"
 SPOOLING_OUTPUT_DIR="$HOME/data/spooling_saves"
 
-if [ ! -d "$WINE_SOURCE_DIR" ]; then
-  WINE_SOURCE_DIR="/cygdrive/c/users/fred/My Documents/My Games"
-fi
-if [ ! -d "$WINE_SOURCE_DIR" ]; then
+if [ ! -d "$WINE_GAMES_DIR" ]; then
   echo "Failing to find the game save directories."
   exit 1
 fi
@@ -31,32 +32,37 @@ function copyem()
 
   if [ -d "$source_dir" ]; then
     echo $game_name
+    if [ ! -d "$out_dir" ]; then
+      mkdir -p "$out_dir"
+      exit_on_error "Creating storage dir: $out_dir"
+    fi
     netcp "$source_dir"/* "$out_dir"/
     sep 28
   fi
 }
 
-# make the output folders if they don't exist.
-for i in skyrim fallout_new_vegas fallout_3 oblivion fallout_4 ; do
-  if [ ! -d "$SPOOLING_OUTPUT_DIR/$i" ]; then
-    mkdir -p "$SPOOLING_OUTPUT_DIR/$i"
-  fi
-done
+#### make the output folders if they don't exist.
+####hmmm: do we really need to do this?
+###for i in skyrim fallout_new_vegas fallout_3 oblivion fallout_4 witcher_3 ; do
+###  if [ ! -d "$SPOOLING_OUTPUT_DIR/$i" ]; then
+###    mkdir -p "$SPOOLING_OUTPUT_DIR/$i"
+###  fi
+###done
 
 # now run through and copy our save files from the potentially weird locations
 # they reside in.
 
 sep 28
 
-copyem "skyrim" "$WINE_SOURCE_DIR/Skyrim/Saves" "$SPOOLING_OUTPUT_DIR/skyrim"
+copyem "skyrim" "$WINE_GAMES_DIR/Skyrim/Saves" "$SPOOLING_OUTPUT_DIR/skyrim"
 
-copyem "fallout new vegas" "$WINE_SOURCE_DIR/FalloutNV/Saves" "$SPOOLING_OUTPUT_DIR/fallout_new_vegas"
+copyem "fallout new vegas" "$WINE_GAMES_DIR/FalloutNV/Saves" "$SPOOLING_OUTPUT_DIR/fallout_new_vegas"
 
-copyem "fallout 3" "$WINE_SOURCE_DIR/Fallout3/Saves" "$SPOOLING_OUTPUT_DIR/fallout_3"
+copyem "fallout 3" "$WINE_GAMES_DIR/Fallout3/Saves" "$SPOOLING_OUTPUT_DIR/fallout_3"
 
-copyem "oblivion" "$WINE_SOURCE_DIR/Oblivion/Saves" "$SPOOLING_OUTPUT_DIR/oblivion/"
+copyem "oblivion" "$WINE_GAMES_DIR/Oblivion/Saves" "$SPOOLING_OUTPUT_DIR/oblivion/"
 
-copyem "fallout 4" "$WINE_SOURCE_DIR/Fallout4/Saves" "$SPOOLING_OUTPUT_DIR/fallout_4"
+copyem "fallout 4" "$WINE_GAMES_DIR/Fallout4/Saves" "$SPOOLING_OUTPUT_DIR/fallout_4"
 
 copyem "witcher 3" "$WINE_GOODS_DIR/The*Witcher*3/gamesaves" "$SPOOLING_OUTPUT_DIR/witcher_3"