From 18f54ecb3c57a2df8783d769c126f7e1f98c5052 Mon Sep 17 00:00:00 2001 From: Connor Gibson Date: Wed, 24 Nov 2021 13:39:37 -0800 Subject: [PATCH 1/3] Removed extra whitespace in whitespace-only lines --- bash_completion/msm | 14 +++++++------- cron/msm | 6 +++--- installers/arch.sh | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bash_completion/msm b/bash_completion/msm index 92b4785..758bf79 100644 --- a/bash_completion/msm +++ b/bash_completion/msm @@ -21,14 +21,14 @@ MSM="${MSM_SCRIPT:-/etc/init.d/msm}" _msm() { source "$MSM" - + local base current options COMPREPLY=() - + current="${COMP_WORDS[$COMP_CWORD]}" manager_property SERVER_STORAGE_PATH - + if [[ $COMP_CWORD == 1 ]]; then if [ -d "$SETTINGS_SERVER_STORAGE_PATH" ]; then local servers="$(ls -1 "$SETTINGS_SERVER_STORAGE_PATH")" @@ -80,7 +80,7 @@ _msm() { server_get_id "${COMP_WORDS[1]}" local sid="$RETURN" fi - + local server_path="$SETTINGS_SERVER_STORAGE_PATH/${COMP_WORDS[1]}" if [[ "${COMP_WORDS[1]}" == "all" ]] || [ -e "$server_path" ]; then @@ -132,7 +132,7 @@ _msm() { if [[ $COMP_CWORD == 3 && -d "$SETTINGS_JAR_STORAGE_PATH" ]]; then options="$(ls -1 "$SETTINGS_JAR_STORAGE_PATH")" fi - + if [[ $COMP_CWORD == 4 && -d "$SETTINGS_JAR_STORAGE_PATH/${COMP_WORDS[3]}" ]]; then options="$(find "$SETTINGS_JAR_STORAGE_PATH/${COMP_WORDS[3]}" -type f -name "*.jar" -exec basename {} \;)" fi @@ -241,13 +241,13 @@ _msm() { fi ;; esac - + fi fi ;; esac fi - + COMPREPLY=( $(compgen -W "${options}" -- ${current}) ) return 0 } diff --git a/cron/msm b/cron/msm index d92b64d..f985429 100644 --- a/cron/msm +++ b/cron/msm @@ -1,12 +1,12 @@ # # Minecraft Server Manager Cron -# +# # Backs up worlds, rolls logs, moves worlds in RAM to disk, # starts crashed servers, and deletes old archives -# +# # For more information visit the project home page: # https://github.com/msmhq/msm -# +# # Backs up all worlds for all servers at 2 minutes past 5 in the morning diff --git a/installers/arch.sh b/installers/arch.sh index 2f2b85c..54e822c 100755 --- a/installers/arch.sh +++ b/installers/arch.sh @@ -16,7 +16,7 @@ function enable_init() { install_log "Installing systemd service unit" sudo wget ${UPDATE_URL}/init/msm.service \ -O /etc/systemd/system/msm.service - + install_log "Enabling automatic startup and shutdown" sudo systemctl enable msm.service } @@ -28,7 +28,7 @@ function create_msm_directories() { sudo mkdir -p "$msm_dir" || install_error "Couldn't create directory '$msm_dir'" fi sudo chown -R $msm_user:$msm_user "$msm_dir" || install_error "Couldn't change file ownership for '$msm_dir'" - + if [ ! -d "/etc/init.d" ]; then sudo mkdir -p "/etc/init.d/" || install_error "Couldn't create directory '/etc/init.d'" fi From a6c8855584ff28002d212224fa0dcaefa8f3f2c8 Mon Sep 17 00:00:00 2001 From: Connor Gibson Date: Wed, 24 Nov 2021 11:13:37 -0800 Subject: [PATCH 2/3] Added newline to end of file if missing --- init/msm.service | 1 - init/msm@.service | 1 - versioning/craftbukkit/1.2.0.sh | 2 +- versioning/minecraft/1.2.0.sh | 2 +- versioning/minecraft/1.3.0.sh | 2 +- versioning/versions.txt | 2 +- 6 files changed, 4 insertions(+), 6 deletions(-) diff --git a/init/msm.service b/init/msm.service index bfd297d..bbfa812 100644 --- a/init/msm.service +++ b/init/msm.service @@ -12,4 +12,3 @@ ExecReload=/usr/local/bin/msm restart [Install] WantedBy=multi-user.target - diff --git a/init/msm@.service b/init/msm@.service index d4b8703..64c0560 100644 --- a/init/msm@.service +++ b/init/msm@.service @@ -12,4 +12,3 @@ ExecReload=/usr/local/bin/msm %i restart [Install] WantedBy=multi-user.target - diff --git a/versioning/craftbukkit/1.2.0.sh b/versioning/craftbukkit/1.2.0.sh index 6d344ba..1c673b5 100644 --- a/versioning/craftbukkit/1.2.0.sh +++ b/versioning/craftbukkit/1.2.0.sh @@ -1,3 +1,3 @@ # MSM version file for CraftBukkit 1.2.0 and above -extends "minecraft/1.2.0" \ No newline at end of file +extends "minecraft/1.2.0" diff --git a/versioning/minecraft/1.2.0.sh b/versioning/minecraft/1.2.0.sh index e8a400e..6863501 100644 --- a/versioning/minecraft/1.2.0.sh +++ b/versioning/minecraft/1.2.0.sh @@ -56,4 +56,4 @@ console_command SAVE_ON "save-on" \ console_command SAVE_OFF "save-off" \ "CONSOLE: Disabling level saving.." console_command SAVE_ALL:10 "save-all" \ - "CONSOLE: Save complete." \ No newline at end of file + "CONSOLE: Save complete." diff --git a/versioning/minecraft/1.3.0.sh b/versioning/minecraft/1.3.0.sh index d6a22bf..03b280d 100644 --- a/versioning/minecraft/1.3.0.sh +++ b/versioning/minecraft/1.3.0.sh @@ -44,4 +44,4 @@ console_command SAVE_ON "save-on" \ console_command SAVE_OFF "save-off" \ "Turned off world auto-saving" console_command SAVE_ALL:10 "save-all" \ - "Saved the world" \ No newline at end of file + "Saved the world" diff --git a/versioning/versions.txt b/versioning/versions.txt index 628eb2f..3bcc583 100644 --- a/versioning/versions.txt +++ b/versioning/versions.txt @@ -9,4 +9,4 @@ minecraft/1.7.0 # CraftBukkit versions craftbukkit/1.2.0 -craftbukkit/1.3.0 \ No newline at end of file +craftbukkit/1.3.0 From 439771593ba5ea0123267d0bdfc008fa2175016a Mon Sep 17 00:00:00 2001 From: Connor Gibson Date: Wed, 24 Nov 2021 13:47:39 -0800 Subject: [PATCH 3/3] Removed extraneous whitespace --- bash_completion/msm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash_completion/msm b/bash_completion/msm index 758bf79..d194895 100644 --- a/bash_completion/msm +++ b/bash_completion/msm @@ -82,7 +82,7 @@ _msm() { fi - local server_path="$SETTINGS_SERVER_STORAGE_PATH/${COMP_WORDS[1]}" + local server_path="$SETTINGS_SERVER_STORAGE_PATH/${COMP_WORDS[1]}" if [[ "${COMP_WORDS[1]}" == "all" ]] || [ -e "$server_path" ]; then if [[ $COMP_CWORD == 2 ]]; then options="start stop restart status connected worlds logroll backup jar whitelist blacklist operator gamemode kick say time toggledownfall give xp save cmd cmdlog console config"