Auto-merging via docker-versions-create

This commit is contained in:
itzg committed 2021-07-02 16:55:52 +00:00
commit 87681e64bb
2 files changed
+6 -6

No files matched your search

+1 -1
View File
@@ -145,7 +145,7 @@ By default, the container will download the latest version of the "vanilla" [Min
* [Enabling Autopause](#enabling-autopause) * [Enabling Autopause](#enabling-autopause)
* [Running on RaspberryPi](#running-on-raspberrypi) * [Running on RaspberryPi](#running-on-raspberrypi)
<!-- Added by: runner, at: Sun Jun 27 13:13:05 UTC 2021 --> <!-- Added by: runner, at: Mon Jun 28 12:13:57 UTC 2021 -->
<!--te--> <!--te-->
+5 -5
View File
@@ -25,16 +25,16 @@ fi
if [ -d /mods ]; then if [ -d /mods ]; then
log "Copying any mods over..." log "Copying any mods over..."
mkdir -p $COPY_MODS_DEST mkdir -p "${COPY_MODS_DEST}"
rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods/ $COPY_MODS_DEST rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods/ "${COPY_MODS_DEST}"
fi fi
: ${COPY_CONFIG_DEST:="/data/config"} : ${COPY_CONFIG_DEST:="/data/config"}
if [ -d /config ]; then if [ -d /config ]; then
log "Copying any configs from /config to $COPY_CONFIG_DEST" log "Copying any configs from /config to ${COPY_CONFIG_DEST}"
mkdir -p $COPY_CONFIG_DEST mkdir -p "${COPY_CONFIG_DEST}"
rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /config/ $COPY_CONFIG_DEST rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /config/ "${COPY_CONFIG_DEST}"
fi fi
exec ${SCRIPTS:-/}start-finalSetupServerProperties $@ exec ${SCRIPTS:-/}start-finalSetupServerProperties $@