From 2c7796ea0b0e712bffc6b3559bedecfc6471d02e Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 22 Oct 2021 21:18:45 -0500 Subject: [PATCH] misc: moved start scripts into `scripts` --- DEVELOPMENT.md | 4 ++-- Dockerfile | 2 +- .../Minecraft server containment.xml | 0 start => scripts/start | 0 start-autopause => scripts/start-autopause | 0 start-configuration => scripts/start-configuration | 0 start-deployAirplane => scripts/start-deployAirplane | 0 start-deployBukkitSpigot => scripts/start-deployBukkitSpigot | 0 start-deployCF => scripts/start-deployCF | 0 start-deployCanyon => scripts/start-deployCanyon | 0 start-deployCatserver => scripts/start-deployCatserver | 0 start-deployCrucible => scripts/start-deployCrucible | 0 start-deployCustom => scripts/start-deployCustom | 0 start-deployFTBA => scripts/start-deployFTBA | 0 start-deployFabric => scripts/start-deployFabric | 0 start-deployForge => scripts/start-deployForge | 0 start-deployLimbo => scripts/start-deployLimbo | 0 start-deployMagma => scripts/start-deployMagma | 0 start-deployMohist => scripts/start-deployMohist | 0 start-deployPaper => scripts/start-deployPaper | 0 start-deployPurpur => scripts/start-deployPurpur | 0 .../start-deploySpongeVanilla | 0 start-deployVanilla => scripts/start-deployVanilla | 0 start-finalExec => scripts/start-finalExec | 0 start-setupEnvVariables => scripts/start-setupEnvVariables | 0 start-setupModconfig => scripts/start-setupModconfig | 0 start-setupModpack => scripts/start-setupModpack | 0 start-setupMounts => scripts/start-setupMounts | 0 .../start-setupServerProperties | 0 start-setupWorld => scripts/start-setupWorld | 0 start-spiget => scripts/start-spiget | 0 start-utils => scripts/start-utils | 0 32 files changed, 3 insertions(+), 3 deletions(-) rename Minecraft server containment.xml => docs/Minecraft server containment.xml (100%) rename start => scripts/start (100%) rename start-autopause => scripts/start-autopause (100%) rename start-configuration => scripts/start-configuration (100%) rename start-deployAirplane => scripts/start-deployAirplane (100%) rename start-deployBukkitSpigot => scripts/start-deployBukkitSpigot (100%) rename start-deployCF => scripts/start-deployCF (100%) rename start-deployCanyon => scripts/start-deployCanyon (100%) rename start-deployCatserver => scripts/start-deployCatserver (100%) rename start-deployCrucible => scripts/start-deployCrucible (100%) mode change 100644 => 100755 rename start-deployCustom => scripts/start-deployCustom (100%) rename start-deployFTBA => scripts/start-deployFTBA (100%) rename start-deployFabric => scripts/start-deployFabric (100%) rename start-deployForge => scripts/start-deployForge (100%) rename start-deployLimbo => scripts/start-deployLimbo (100%) rename start-deployMagma => scripts/start-deployMagma (100%) rename start-deployMohist => scripts/start-deployMohist (100%) rename start-deployPaper => scripts/start-deployPaper (100%) rename start-deployPurpur => scripts/start-deployPurpur (100%) rename start-deploySpongeVanilla => scripts/start-deploySpongeVanilla (100%) rename start-deployVanilla => scripts/start-deployVanilla (100%) rename start-finalExec => scripts/start-finalExec (100%) rename start-setupEnvVariables => scripts/start-setupEnvVariables (100%) rename start-setupModconfig => scripts/start-setupModconfig (100%) rename start-setupModpack => scripts/start-setupModpack (100%) rename start-setupMounts => scripts/start-setupMounts (100%) rename start-setupServerProperties => scripts/start-setupServerProperties (100%) rename start-setupWorld => scripts/start-setupWorld (100%) rename start-spiget => scripts/start-spiget (100%) rename start-utils => scripts/start-utils (100%) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 86df0d84..1b33d2e2 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -2,10 +2,10 @@ Adding a new server `TYPE` can vary due to the complexity of obtaining and configuring each type; however, the addition of any server type includes at least the following steps: -1. Copy an existing "start-deploy*" script, such as [start-deployMohist](start-deployMohist) and rename it accordingly making sure to retain the "start-deploy" prefix +1. Copy an existing "start-deploy*" script, such as [start-deployMohist](scripts/start-deployMohist) and rename it accordingly making sure to retain the "start-deploy" prefix 2. Modify the type-specific behavior between the "start-utils" preamble and the hand-off to `start-setupWorld` at the end of the script 3. Develop and test the changes using the [iterative process described below](#iterative-script-development) -4. Add a case-entry to the `case "${TYPE^^}"` in [start-configuration](start-configuration) +4. Add a case-entry to the `case "${TYPE^^}"` in [start-configuration](scripts/start-configuration) 5. Add a section to the [README](README.md). It is recommended to copy-modify an existing section to retain a similar wording and level of detail 6. [Submit a pull request](https://github.com/itzg/docker-minecraft-server/pulls) diff --git a/Dockerfile b/Dockerfile index b5b3aec6..7e668dd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,7 +81,7 @@ ENV UID=1000 GID=1000 \ ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \ AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0 -COPY start* / +COPY scripts/start* / COPY bin/ /usr/local/bin/ COPY bin/mc-health /health.sh diff --git a/Minecraft server containment.xml b/docs/Minecraft server containment.xml similarity index 100% rename from Minecraft server containment.xml rename to docs/Minecraft server containment.xml diff --git a/start b/scripts/start similarity index 100% rename from start rename to scripts/start diff --git a/start-autopause b/scripts/start-autopause similarity index 100% rename from start-autopause rename to scripts/start-autopause diff --git a/start-configuration b/scripts/start-configuration similarity index 100% rename from start-configuration rename to scripts/start-configuration diff --git a/start-deployAirplane b/scripts/start-deployAirplane similarity index 100% rename from start-deployAirplane rename to scripts/start-deployAirplane diff --git a/start-deployBukkitSpigot b/scripts/start-deployBukkitSpigot similarity index 100% rename from start-deployBukkitSpigot rename to scripts/start-deployBukkitSpigot diff --git a/start-deployCF b/scripts/start-deployCF similarity index 100% rename from start-deployCF rename to scripts/start-deployCF diff --git a/start-deployCanyon b/scripts/start-deployCanyon similarity index 100% rename from start-deployCanyon rename to scripts/start-deployCanyon diff --git a/start-deployCatserver b/scripts/start-deployCatserver similarity index 100% rename from start-deployCatserver rename to scripts/start-deployCatserver diff --git a/start-deployCrucible b/scripts/start-deployCrucible old mode 100644 new mode 100755 similarity index 100% rename from start-deployCrucible rename to scripts/start-deployCrucible diff --git a/start-deployCustom b/scripts/start-deployCustom similarity index 100% rename from start-deployCustom rename to scripts/start-deployCustom diff --git a/start-deployFTBA b/scripts/start-deployFTBA similarity index 100% rename from start-deployFTBA rename to scripts/start-deployFTBA diff --git a/start-deployFabric b/scripts/start-deployFabric similarity index 100% rename from start-deployFabric rename to scripts/start-deployFabric diff --git a/start-deployForge b/scripts/start-deployForge similarity index 100% rename from start-deployForge rename to scripts/start-deployForge diff --git a/start-deployLimbo b/scripts/start-deployLimbo similarity index 100% rename from start-deployLimbo rename to scripts/start-deployLimbo diff --git a/start-deployMagma b/scripts/start-deployMagma similarity index 100% rename from start-deployMagma rename to scripts/start-deployMagma diff --git a/start-deployMohist b/scripts/start-deployMohist similarity index 100% rename from start-deployMohist rename to scripts/start-deployMohist diff --git a/start-deployPaper b/scripts/start-deployPaper similarity index 100% rename from start-deployPaper rename to scripts/start-deployPaper diff --git a/start-deployPurpur b/scripts/start-deployPurpur similarity index 100% rename from start-deployPurpur rename to scripts/start-deployPurpur diff --git a/start-deploySpongeVanilla b/scripts/start-deploySpongeVanilla similarity index 100% rename from start-deploySpongeVanilla rename to scripts/start-deploySpongeVanilla diff --git a/start-deployVanilla b/scripts/start-deployVanilla similarity index 100% rename from start-deployVanilla rename to scripts/start-deployVanilla diff --git a/start-finalExec b/scripts/start-finalExec similarity index 100% rename from start-finalExec rename to scripts/start-finalExec diff --git a/start-setupEnvVariables b/scripts/start-setupEnvVariables similarity index 100% rename from start-setupEnvVariables rename to scripts/start-setupEnvVariables diff --git a/start-setupModconfig b/scripts/start-setupModconfig similarity index 100% rename from start-setupModconfig rename to scripts/start-setupModconfig diff --git a/start-setupModpack b/scripts/start-setupModpack similarity index 100% rename from start-setupModpack rename to scripts/start-setupModpack diff --git a/start-setupMounts b/scripts/start-setupMounts similarity index 100% rename from start-setupMounts rename to scripts/start-setupMounts diff --git a/start-setupServerProperties b/scripts/start-setupServerProperties similarity index 100% rename from start-setupServerProperties rename to scripts/start-setupServerProperties diff --git a/start-setupWorld b/scripts/start-setupWorld similarity index 100% rename from start-setupWorld rename to scripts/start-setupWorld diff --git a/start-spiget b/scripts/start-spiget similarity index 100% rename from start-spiget rename to scripts/start-spiget diff --git a/start-utils b/scripts/start-utils similarity index 100% rename from start-utils rename to scripts/start-utils