[mc] Install iputils and wget for FTB compat

[mc] For FTB pass-thru custom mod URLs
for #155
2026-05-22 03:35:25 +00:00 · 2017-09-24 11:46:47 -05:00 · 2017-09-03 20:20:25 -05:00
2 changed files with 14 additions and 10 deletions
@@ -8,7 +8,7 @@ RUN apk add -U \
          lsof \
          su-exec \
          bash \
-          curl \
+          curl iputils wget \
          git \
          jq \
          mysql-client \
@@ -270,16 +270,18 @@ function installFTB {
  local srv_modpack=${FTB_SERVER_MOD}
  if isURL ${srv_modpack}; then
      case $srv_modpack in
-        */download)
+        https://www.feed-the-beast.com/*/download)
          break;;
-        *)
+        https://www.feed-the-beast.com/*)
          srv_modpack=${srv_modpack}/download;;
      esac
      local file=$(basename $(dirname $srv_modpack))
      local downloaded=/data/${file}.zip
-      echo "Downloading FTB modpack...
+      if [ ! -e $downloaded ]; then
+        echo "Downloading FTB modpack...
  $srv_modpack -> $downloaded"
-      curl -sSL -o $downloaded $srv_modpack
+        curl -sSL -o $downloaded $srv_modpack
+      fi
      srv_modpack=$downloaded
  fi
  if [[ ${srv_modpack:0:5} == "data/" ]]; then
@@ -300,10 +302,12 @@ function installFTB {
      exit 2
  fi

-  echo "Unpacking FTB server modpack ${srv_modpack} ..."
-  mkdir -p ${FTB_DIR}
-  unzip -o ${srv_modpack} -d ${FTB_DIR}
-  cp -f /data/eula.txt ${FTB_DIR}/eula.txt
+  if [ ! -d ${FTB_DIR} ]; then
+    echo "Unpacking FTB server modpack ${srv_modpack} ..."
+    mkdir -p ${FTB_DIR}
+    unzip -o ${srv_modpack} -d ${FTB_DIR}
+    cp -f /data/eula.txt ${FTB_DIR}/eula.txt
+  fi
  FTB_SERVER_START=${FTB_DIR}/ServerStart.sh
  chmod a+x ${FTB_SERVER_START}
  sed -i "s/-jar/-Dfml.queryResult=confirm -jar/" ${FTB_SERVER_START}
@@ -646,7 +650,7 @@ if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
    cp -f /data/{eula,ops,white-list}.txt ${FTB_DIR}/
    cd ${FTB_DIR}
    echo "Running FTB server modpack start ..."
-    exec sh ${FTB_SERVER_START}
+    exec ${FTB_SERVER_START}
 else
    # If we have a bootstrap.txt file... feed that in to the server stdin
    if [ -f /data/bootstrap.txt ];
Author	SHA1	Message	Date
Geoff Bourne	e5a4428515	[mc] Install iputils and wget for FTB compat	2017-09-24 11:46:47 -05:00
Geoff Bourne	6b9033318b	[mc] For FTB pass-thru custom mod URLs for #155	2017-09-03 20:20:25 -05:00