Mirrors/docker-minecraft-server
2
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server synced 2024-11-10 14:24:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

add some /data prefixes in missing places (#493)

Browse source 
Co-authored-by: rienafairefr <rienafairefr@gmail.com>
This commit is contained in:
Matthieu Berthomé 2020-04-15 15:20:11 +02:00 committed by GitHub
parent 8dbbdd8cd2
commit 220f2fbd79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
start-configuration
View file

@ -19,9 +19,9 @@ if [ ! -e /data/eula.txt ]; then
exit 1
fi
echo "# Generated via Docker on $(date)" > eula.txt
echo "# Generated via Docker on $(date)" > /data/eula.txt
if ! echo "eula=$EULA" >> eula.txt; then
if ! echo "eula=$EULA" >> /data/eula.txt; then
log "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
exit 2
fi

2
start-deployFabric
View file

@ -29,7 +29,7 @@ elif [[ ! -e $FABRIC_INSTALLER ]]; then
exit 2
fi
installMarker=".fabric-installed-${VANILLA_VERSION}-${FABRIC_VERSION:-manual}"
installMarker="/data/.fabric-installed-${VANILLA_VERSION}-${FABRIC_VERSION:-manual}"
debug Checking for installMarker ${installMarker}
if [[ ! -e $installMarker ]]; then

2
start-deployForge
View file

@ -47,7 +47,7 @@ elif [[ ! -e $FORGE_INSTALLER ]]; then
exit 2
fi
installMarker=".forge-installed-$shortForgeVersion"
installMarker="/data/.forge-installed-$shortForgeVersion"
if [ ! -e $installMarker ]; then
if [ ! -e $FORGE_INSTALLER ]; then

10
start-minecraftFinalSetup
View file

@ -4,14 +4,14 @@
if [ -n "$OPS" ]; then
log "Setting/adding ops"
rm -rf ops.txt.converted
echo $OPS | awk -v RS=, '{print}' > ops.txt
rm -rf /data/ops.txt.converted
echo $OPS | awk -v RS=, '{print}' > /data/ops.txt
fi
if [ -n "$WHITELIST" ]; then
log "Setting whitelist"
rm -rf white-list.txt.converted
echo $WHITELIST | awk -v RS=, '{print}' > white-list.txt
rm -rf /data/white-list.txt.converted
echo $WHITELIST | awk -v RS=, '{print}' > /data/white-list.txt
fi
if [ -n "$ICON" -a ! -e server-icon.png ]; then
@ -41,7 +41,7 @@ fi
# Make sure files exist and are valid JSON (for pre-1.12 to 1.12 upgrades)
log "Checking for JSON files."
JSON_FILES=$(find . -maxdepth 1 -name '*.json')
JSON_FILES=$(find /data -maxdepth 1 -name '*.json')
for j in $JSON_FILES; do
if [[ $(cat "$j" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') == "" ]]; then
log "Fixing JSON $j"