CurseForge modpacks use run.sh when present (#1534)

* CurseForge modpacks use run.sh when present

* Added lbzip2
This commit is contained in:
Geoff Bourne 2022-05-26 22:02:26 -05:00 committed by GitHub
parent ea7046f93d
commit 08556a63b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View File

@ -22,6 +22,7 @@ apt-get install -y \
nano \
unzip \
zstd \
lbzip2 \
knockd
apt-get clean

View File

@ -33,7 +33,10 @@ export TYPE=CURSEFORGE
FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
log "Looking for Feed-The-Beast / CurseForge server modpack."
requireVar FTB_SERVER_MOD
if [[ ! $FTB_SERVER_MOD ]]; then
log "ERROR: CF_SERVER_MOD or FTB_SERVER_MOD is required to be set"
exit 1
fi
downloadModpack() {
srv_modpack=${FTB_SERVER_MOD}
@ -142,6 +145,7 @@ entryScriptExpr="
-o -name start-server.sh
-o -name startserver.sh
-o -name StartServer.sh
-o -name run.sh
"
if [[ -d ${FTB_BASE_DIR} ]]; then
@ -170,8 +174,8 @@ if [[ $startScriptCount = 0 ]]; then
(
cd "$(dirname "${installScript}")"
chmod +x ./install.sh
log "Running included install.sh"
./install.sh
log "Running included install.sh. This might take a minute or two..."
./install.sh > install.log
)
fi
fi