Mirrored_Repos/msm
1
0
Fork 0
mirror of https://github.com/msmhq/msm.git synced 2024-08-30 18:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #298 from renderorange/backwards_compat_fixes

Browse Source 
Version target correction
This commit is contained in:
Blaine Motsinger
2015-07-23 07:43:37 -05:00
parent 02ece2d2b3 40e73a20e6
commit b4eeb39094
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
init/msm
View File

@ -28,7 +28,7 @@
# The Minecraft Server Manager version, use "msm version" to check yours. # The Minecraft Server Manager version, use "msm version" to check yours.
VERSION="0.9.0" VERSION="0.9.1"
# Source, if it exists, the msm profile.d script # Source, if it exists, the msm profile.d script
@ -1104,15 +1104,20 @@ jargroup_getlatest() {
wget_opts="" wget_opts=""
fi fi
# If target contains the word 'release' or 'snapshot' check JSON version file for correct filename # If target contains the word 'minecraft' or 'minecraft-snapshot', check JSON version file for correct filename
# Look for Latest tag to find the latest snapshot and release. Not sure what happens in the JSON after a snapshot is released though... # This method allows for backwards compatibility with previous releases
local target="$(as_user "$SETTINGS_USERNAME" "cat $SETTINGS_JAR_STORAGE_PATH/$1/$SETTINGS_JARGROUP_TARGET")" local target="$(as_user "$SETTINGS_USERNAME" "cat $SETTINGS_JAR_STORAGE_PATH/$1/$SETTINGS_JARGROUP_TARGET")"
if [[ "$target" == "release" ]] || [[ "$target" == "snapshot" ]]; then if [[ "$target" =~ ^minecraft ]]; then
if [[ "$target" == "minecraft" ]]; then
local versions_target="release"
elif [[ "$target" == "minecraft-snapshot" ]]; then
local versions_target="snapshot"
fi
printf "Checking minecraft version JSON... " printf "Checking minecraft version JSON... "
local versions_url="http://s3.amazonaws.com/Minecraft.Download/versions/versions.json" local versions_url="http://s3.amazonaws.com/Minecraft.Download/versions/versions.json"
local versions_file="/tmp/minecraft_versions.json" local versions_file="/tmp/minecraft_versions.json"
as_user "$SETTINGS_USERNAME" "wget --quiet $wget_opts --no-check-certificate -O '$versions_file' '$versions_url'" as_user "$SETTINGS_USERNAME" "wget --quiet $wget_opts --no-check-certificate -O '$versions_file' '$versions_url'"
local latest_version=$(as_user "$SETTINGS_USERNAME" "sed -n '/"latest"/,/}/p' $versions_file | grep $target | egrep -o '([0-9]+\.?)+|([0-9]+[a-zA-Z])+'") local latest_version=$(as_user "$SETTINGS_USERNAME" "sed -n '/"latest"/,/}/p' $versions_file | grep $versions_target | egrep -o '([0-9]+\.?)+|([0-9]+[a-zA-Z])+'")
if [[ -n "$latest_version" ]]; then if [[ -n "$latest_version" ]]; then
local jar_url="https://s3.amazonaws.com/Minecraft.Download/versions/$latest_version/minecraft_server.$latest_version.jar" local jar_url="https://s3.amazonaws.com/Minecraft.Download/versions/$latest_version/minecraft_server.$latest_version.jar"

2
installers/common.sh
View File

@ -153,7 +153,7 @@ function update_msm() {
# Updates rest of MSM using init script updater # Updates rest of MSM using init script updater
function setup_jargroup() { function setup_jargroup() {
install_log "Setup default jar groups" install_log "Setup default jar groups"
sudo /etc/init.d/msm jargroup create minecraft release sudo /etc/init.d/msm jargroup create minecraft minecraft
} }
function install_complete() { function install_complete() {