Skip to content

Commit 58586ce

Browse files
committed
Fix migration bug (#160)
1 parent 6b52ec6 commit 58586ce

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

run.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ set_ini_prop "ServerSettings.ini" "\/Script\/FactoryGame\.FGServerSubsystem" "mA
8383
if ! [[ "${SKIPUPDATE,,}" == "true" ]]; then
8484
if [[ "${STEAMBETA,,}" == "true" ]]; then
8585
printf "Experimental flag is set. Experimental will be downloaded instead of Early Access.\\n"
86-
STEAMBETAFLAG=" -beta experimental validate"
86+
STEAMBETAFLAG="experimental"
8787
else
88-
STEAMBETAFLAG=" -beta public validate"
88+
STEAMBETAFLAG="public"
8989
fi
9090

9191
STORAGEAVAILABLE=$(stat -f -c "%a*%S" .)
@@ -98,26 +98,26 @@ if ! [[ "${SKIPUPDATE,,}" == "true" ]]; then
9898

9999
printf "Downloading the latest version of the game...\\n"
100100

101-
steamcmd +force_install_dir /config/gamefiles +login anonymous +app_update "$STEAMAPPID" $STEAMBETAFLAG +quit
101+
steamcmd +force_install_dir /config/gamefiles +login anonymous +app_update "$STEAMAPPID" -beta "$STEAMBETAFLAG" validate +quit
102102
else
103103
printf "Skipping update as flag is set\\n"
104104
fi
105105

106106
# temporary migration to new format
107107
if [ -d "/config/blueprints" ]; then
108-
if [ $(ls "/config/blueprints" | wc -l) -eq 0 ]; then
109-
rm -rf "/config/blueprints"
110-
else
108+
if [ -n "$(ls -A "/config/blueprints" 2>/dev/null)" ]; then
111109
rm -rf "/config/saved/blueprints"
112110
mv "/config/blueprints" "/config/saved/blueprints"
111+
else
112+
rm -rf "/config/blueprints"
113113
fi
114114
fi
115115

116116
if [ -d "/config/saves" ]; then
117-
if [ $(ls "/config/saves" | wc -l) -eq 0 ]; then
118-
rmdir "/config/saves"
117+
if [ -n "$(ls -A "/config/saves" 2>/dev/null)" ]; then
118+
find "/config/saves/" -type f -print0 | xargs -0 mv -t "/config/saved/server" || exit 1
119119
else
120-
find "/config/saves/" -type f -print0 | xargs -0 mv -t "/config/saved/server"
120+
rmdir "/config/saves"
121121
fi
122122
fi
123123

0 commit comments

Comments
 (0)