Skip to content

Commit 3f5bab8

Browse files
authored
Merge pull request #431 from Next-Door-Tech/cleanup
Very minor - clean up extraneous whitespace
2 parents 711b15a + 4397715 commit 3f5bab8

File tree

9 files changed

+17
-19
lines changed

9 files changed

+17
-19
lines changed

bash_completion/msm

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ MSM="${MSM_SCRIPT:-/etc/init.d/msm}"
2121

2222
_msm() {
2323
source "$MSM"
24-
24+
2525
local base current options
2626
COMPREPLY=()
27-
27+
2828
current="${COMP_WORDS[$COMP_CWORD]}"
2929

3030
manager_property SERVER_STORAGE_PATH
31-
31+
3232
if [[ $COMP_CWORD == 1 ]]; then
3333
if [ -d "$SETTINGS_SERVER_STORAGE_PATH" ]; then
3434
local servers="$(ls -1 "$SETTINGS_SERVER_STORAGE_PATH")"
@@ -80,9 +80,9 @@ _msm() {
8080
server_get_id "${COMP_WORDS[1]}"
8181
local sid="$RETURN"
8282
fi
83-
8483

85-
local server_path="$SETTINGS_SERVER_STORAGE_PATH/${COMP_WORDS[1]}"
84+
85+
local server_path="$SETTINGS_SERVER_STORAGE_PATH/${COMP_WORDS[1]}"
8686
if [[ "${COMP_WORDS[1]}" == "all" ]] || [ -e "$server_path" ]; then
8787
if [[ $COMP_CWORD == 2 ]]; then
8888
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"
@@ -132,7 +132,7 @@ _msm() {
132132
if [[ $COMP_CWORD == 3 && -d "$SETTINGS_JAR_STORAGE_PATH" ]]; then
133133
options="$(ls -1 "$SETTINGS_JAR_STORAGE_PATH")"
134134
fi
135-
135+
136136
if [[ $COMP_CWORD == 4 && -d "$SETTINGS_JAR_STORAGE_PATH/${COMP_WORDS[3]}" ]]; then
137137
options="$(find "$SETTINGS_JAR_STORAGE_PATH/${COMP_WORDS[3]}" -type f -name "*.jar" -exec basename {} \;)"
138138
fi
@@ -241,13 +241,13 @@ _msm() {
241241
fi
242242
;;
243243
esac
244-
244+
245245
fi
246246
fi
247247
;;
248248
esac
249249
fi
250-
250+
251251
COMPREPLY=( $(compgen -W "${options}" -- ${current}) )
252252
return 0
253253
}

cron/msm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#
22
# Minecraft Server Manager Cron
3-
#
3+
#
44
# Backs up worlds, rolls logs, moves worlds in RAM to disk,
55
# starts crashed servers, and deletes old archives
6-
#
6+
#
77
# For more information visit the project home page:
88
# https://github.com/msmhq/msm
9-
#
9+
#
1010

1111

1212
# Backs up all worlds for all servers at 2 minutes past 5 in the morning

init/msm.service

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ ExecReload=/usr/local/bin/msm restart
1212

1313
[Install]
1414
WantedBy=multi-user.target
15-

init/[email protected]

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ ExecReload=/usr/local/bin/msm %i restart
1212

1313
[Install]
1414
WantedBy=multi-user.target
15-

installers/arch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function enable_init() {
1616
install_log "Installing systemd service unit"
1717
sudo wget ${UPDATE_URL}/init/msm.service \
1818
-O /etc/systemd/system/msm.service
19-
19+
2020
install_log "Enabling automatic startup and shutdown"
2121
sudo systemctl enable msm.service
2222
}
@@ -28,7 +28,7 @@ function create_msm_directories() {
2828
sudo mkdir -p "$msm_dir" || install_error "Couldn't create directory '$msm_dir'"
2929
fi
3030
sudo chown -R $msm_user:$msm_user "$msm_dir" || install_error "Couldn't change file ownership for '$msm_dir'"
31-
31+
3232
if [ ! -d "/etc/init.d" ]; then
3333
sudo mkdir -p "/etc/init.d/" || install_error "Couldn't create directory '/etc/init.d'"
3434
fi

versioning/craftbukkit/1.2.0.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# MSM version file for CraftBukkit 1.2.0 and above
22

3-
extends "minecraft/1.2.0"
3+
extends "minecraft/1.2.0"

versioning/minecraft/1.2.0.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ console_command SAVE_ON "save-on" \
5656
console_command SAVE_OFF "save-off" \
5757
"CONSOLE: Disabling level saving.."
5858
console_command SAVE_ALL:10 "save-all" \
59-
"CONSOLE: Save complete."
59+
"CONSOLE: Save complete."

versioning/minecraft/1.3.0.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ console_command SAVE_ON "save-on" \
4444
console_command SAVE_OFF "save-off" \
4545
"Turned off world auto-saving"
4646
console_command SAVE_ALL:10 "save-all" \
47-
"Saved the world"
47+
"Saved the world"

versioning/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ minecraft/1.7.0
99

1010
# CraftBukkit versions
1111
craftbukkit/1.2.0
12-
craftbukkit/1.3.0
12+
craftbukkit/1.3.0

0 commit comments

Comments
 (0)