From 2ebcc0fe0051fee282f70a9c6ed5f746d59d1c4f Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 13 Oct 2023 15:54:45 -0500 Subject: [PATCH] MOTD no longer needs to be pre-normalized (#2434) --- scripts/start-setupServerProperties | 3 --- tests/setuponlytests/cf_files/require.sh | 0 .../conflicting_world_for_spigot_server/require.sh | 0 .../conflicting_world_for_vanilla_server/require.sh | 0 tests/setuponlytests/curseforge/require.sh | 0 tests/setuponlytests/icon-file-exact/require.sh | 0 tests/setuponlytests/icon-gif-multiframe/require.sh | 0 tests/setuponlytests/icon-png-atscale/require.sh | 0 tests/setuponlytests/pufferfish/require.sh | 0 tests/setuponlytests/quilt/require.sh | 0 tests/setuponlytests/spiget/require.sh | 1 + .../setuponlytests/spigot_world_for_vanilla_server/require.sh | 0 tests/setuponlytests/spongevanilla_version_compare/require.sh | 0 tests/setuponlytests/test.sh | 0 .../setuponlytests/vanilla_world_for_spigot_server/require.sh | 0 tests/setuponlytests/vanillatweaks_sharecode/require.sh | 0 tests/setuponlytests/world_from_tar/require.sh | 0 tests/setuponlytests/world_from_tarbz2/require.sh | 0 tests/setuponlytests/world_from_tarzst/require.sh | 0 19 files changed, 1 insertion(+), 3 deletions(-) mode change 100644 => 100755 tests/setuponlytests/cf_files/require.sh mode change 100644 => 100755 tests/setuponlytests/conflicting_world_for_spigot_server/require.sh mode change 100644 => 100755 tests/setuponlytests/conflicting_world_for_vanilla_server/require.sh mode change 100644 => 100755 tests/setuponlytests/curseforge/require.sh mode change 100644 => 100755 tests/setuponlytests/icon-file-exact/require.sh mode change 100644 => 100755 tests/setuponlytests/icon-gif-multiframe/require.sh mode change 100644 => 100755 tests/setuponlytests/icon-png-atscale/require.sh mode change 100644 => 100755 tests/setuponlytests/pufferfish/require.sh mode change 100644 => 100755 tests/setuponlytests/quilt/require.sh create mode 100755 tests/setuponlytests/spiget/require.sh mode change 100644 => 100755 tests/setuponlytests/spigot_world_for_vanilla_server/require.sh mode change 100644 => 100755 tests/setuponlytests/spongevanilla_version_compare/require.sh mode change 100644 => 100755 tests/setuponlytests/test.sh mode change 100644 => 100755 tests/setuponlytests/vanilla_world_for_spigot_server/require.sh mode change 100644 => 100755 tests/setuponlytests/vanillatweaks_sharecode/require.sh mode change 100644 => 100755 tests/setuponlytests/world_from_tar/require.sh mode change 100644 => 100755 tests/setuponlytests/world_from_tarbz2/require.sh mode change 100644 => 100755 tests/setuponlytests/world_from_tarzst/require.sh diff --git a/scripts/start-setupServerProperties b/scripts/start-setupServerProperties index 1f1628a3..97f57cea 100755 --- a/scripts/start-setupServerProperties +++ b/scripts/start-setupServerProperties @@ -28,9 +28,6 @@ function customizeServerProps { MOTD="{\"text\":\"${MOTD}\"}" fi fi - if [[ $MOTD ]]; then - MOTD="$(echo "$MOTD" | mc-image-helper asciify)" - fi if [[ -v MODE ]]; then log "Setting mode" diff --git a/tests/setuponlytests/cf_files/require.sh b/tests/setuponlytests/cf_files/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/conflicting_world_for_spigot_server/require.sh b/tests/setuponlytests/conflicting_world_for_spigot_server/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/conflicting_world_for_vanilla_server/require.sh b/tests/setuponlytests/conflicting_world_for_vanilla_server/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/curseforge/require.sh b/tests/setuponlytests/curseforge/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/icon-file-exact/require.sh b/tests/setuponlytests/icon-file-exact/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/icon-gif-multiframe/require.sh b/tests/setuponlytests/icon-gif-multiframe/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/icon-png-atscale/require.sh b/tests/setuponlytests/icon-png-atscale/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/pufferfish/require.sh b/tests/setuponlytests/pufferfish/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/quilt/require.sh b/tests/setuponlytests/quilt/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/spiget/require.sh b/tests/setuponlytests/spiget/require.sh new file mode 100755 index 00000000..a3b89f11 --- /dev/null +++ b/tests/setuponlytests/spiget/require.sh @@ -0,0 +1 @@ +[[ $EXTENDED_TESTS ]] || exit 1 \ No newline at end of file diff --git a/tests/setuponlytests/spigot_world_for_vanilla_server/require.sh b/tests/setuponlytests/spigot_world_for_vanilla_server/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/spongevanilla_version_compare/require.sh b/tests/setuponlytests/spongevanilla_version_compare/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/test.sh b/tests/setuponlytests/test.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/vanilla_world_for_spigot_server/require.sh b/tests/setuponlytests/vanilla_world_for_spigot_server/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/vanillatweaks_sharecode/require.sh b/tests/setuponlytests/vanillatweaks_sharecode/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/world_from_tar/require.sh b/tests/setuponlytests/world_from_tar/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/world_from_tarbz2/require.sh b/tests/setuponlytests/world_from_tarbz2/require.sh old mode 100644 new mode 100755 diff --git a/tests/setuponlytests/world_from_tarzst/require.sh b/tests/setuponlytests/world_from_tarzst/require.sh old mode 100644 new mode 100755