mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-06-09 20:09:46 +00:00
Merge branch 'master' into java8
This commit is contained in:
@@ -167,6 +167,16 @@ if [[ $startScriptCount = 0 ]]; then
|
|||||||
log "Unpacking FTB server modpack ${srv_modpack} ..."
|
log "Unpacking FTB server modpack ${srv_modpack} ..."
|
||||||
mkdir -p ${FTB_BASE_DIR}
|
mkdir -p ${FTB_BASE_DIR}
|
||||||
unzip -o "${srv_modpack}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
|
unzip -o "${srv_modpack}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
|
||||||
|
|
||||||
|
installScript=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f -name install.sh)
|
||||||
|
if [[ "$installScript" ]]; then
|
||||||
|
(
|
||||||
|
cd "$(dirname "${installScript}")"
|
||||||
|
chmod +x ./install.sh
|
||||||
|
log "Running included install.sh"
|
||||||
|
./install.sh
|
||||||
|
)
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then
|
if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user