Compare commits

..

No commits in common. "main" and "v1.1.2" have entirely different histories.
main ... v1.1.2

10 changed files with 49 additions and 246 deletions

13
.github/FUNDING.yml vendored
View file

@ -1,13 +0,0 @@
# These are supported funding model platforms
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: jiriks74 # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

View file

@ -5,10 +5,9 @@ function get_existing_server {
if ls paper-*.jar 1> /dev/null 2>&1; then
existing_server_type="paper"
get_existing_paper
elif ls fabric-server-mc.*.jar 1> /dev/null 2>&1; then
existing_server_type="fabric"
get_existing_fabric
# TODO: Add support for other server types
# elif ls fabric-*.jar 1> /dev/null 2>&1; then
# existing_server_type="fabric"
# elif ls spigot-*.jar 1> /dev/null 2>&1; then
# existing_server_type="spigot"
# elif ls craftbukkit-*.jar 1> /dev/null 2>&1; then
@ -31,30 +30,6 @@ function get_existing_server {
fi
}
# Get existing version and build of fabric
function get_existing_fabric {
# Get the current server file name
server_file=$(basename ./fabric-server-mc.*.jar)
# Assign the file name to a variable
FILE=$server_file
# Remove the .jar extension
FILE=${FILE%.jar}
# Split by - and get the third field (mc.x.x.x)
current_version=$(echo $FILE | cut -d. -f2,3,4 | cut -d- -f1)
# Split by - and get the fourth field (launcher.x.x.x)
current_build=$(echo $FILE | cut -d- -f4 | cut -d. -f2,3,4)
echo "Current server file: $server_file"
echo " - Version $current_version"
echo " - Build $current_build"
echo
echo
}
# Get existing version and build of paper
function get_existing_paper {
# Get the current server file name

View file

@ -1,118 +0,0 @@
#!/bin/bash
set -e
# API URL
api_url="https://meta.fabricmc.net/v2/versions/"
# Example server's jar file name:
# fabric-server-mc.1.19.3-loader.0.14.14-launcher.0.11.1.jar
function check_version_valid {
if [[ $(curl -s "$(echo $api_url)/loader/$(echo $version)") == "[]" ]]; then
>&2 echo "Error: Invalid version selected: $version"
exit 2
else
# Check if selected build exists
if [ ! -z "$build" ]; then
if [[ $(curl -s "$(echo $api_url)/loader/$(echo $version)/$(echo $build)") == "\"no loader version found for $(echo $version)\"" ]]; then
>&2 echo "Error: Invalid build selected: $build"
exit 2
fi
fi
fi
}
function download_server {
# Download the server
echo "Downloading Fabric server..."
echo " - Version $version"
echo " - Build $download_build"
echo " - Installer $latest_installer"
curl "$(echo $api_url)/loader/$(echo $version)/$(echo $download_build)/$(echo $latest_installer)/server/jar" -o "./fabric-server-mc.$(echo $version)-loader.$(echo $download_build)-launcher.$(echo $latest_installer).jar"
echo "Download complete."
}
function check_updates {
if [[ $server_file == false ]]; then
download_build=$latest_build
update_version=true
update_build=true
return
else
echo Checking for updates...
fi
# Check if $build is empty
if [[ -z $build ]]; then
# Check if the current version is the same as the one selected
if [[ $current_version == $version ]]; then
# Check if the current build is the same as the one selected
if [[ $current_build == $latest_build ]]; then
echo "Server is up to date."
else
echo "Server is not up to date."
download_build=$latest_build
update_build=true
fi
else
# Check if $server_file is false
ask_version_differs
echo "Server is not up to date."
download_build=$latest_build
update_version=true
fi
else
# Check if the current version is the same as the one selected
if [[ $current_version == $version ]]; then
# Check if the current build is the same as the one selected
if [[ $current_build == $build ]]; then
echo "Server is up to date."
else
echo "Server is not up to date."
download_build=$build
update_build=true
fi
else
# Check if $server_file is false
ask_version_differs
echo "Server is not up to date."
download_build=$build
update_version=true
fi
fi
}
# Get the latest build number and installer version
function get_latest_build {
# Get the latest build number
latest_build=$(curl -s "$(echo $api_url)/loader/$version" | jq -r '.[0].loader.version')
latest_installer=$(curl -s "$(echo $api_url)/installer/" | jq -r '.[0].version')
}
# Check if the server is up to date and update if it isn't
function check_and_update {
if ! [[ $server_file == false ]]; then
echo Checking for updates...
fi
# Get the latest build number
get_latest_build
# Check if the current version is up to date
check_updates
# Check if $build_update is true or $version_update is true
if [[ $update_build == true ]] || [[ $update_version == true ]]; then
if [[ $server_file != false ]]; then
old_server_file=$server_file
server_file="fabric-server-mc.$version-loader.$download_build-launcher.$latest_installer.jar"
download_server
# Delete the old server file
delete_old_server
else
server_file="fabric-server-mc.$version-loader.$download_build-launcher.$latest_installer.jar"
download_server
fi
fi
echo
echo
}

View file

@ -86,16 +86,16 @@ function check_script_java {
# Get the system Java version
function check_java_exec {
# Check if java is installed
if ! command -v java &> /dev/null; then
java_version=false
else
# Get the current Java version and extract the build number
java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F '.' '{print $1}')
# Check if java is installed
if ! command -v java &> /dev/null
then
java_version=false
fi
if [[ $java_version != $required_java ]]; then
java_version=false
# If java is installed, get the version (the java_version won't be 0)
if [[ $java_version != false ]]; then
# Get the current Java version and extract the build number
java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F '.' '{print $1}')
fi
}
@ -172,11 +172,11 @@ function download_jre {
rm java.tar.gz
elif [[ $required_java == "16" ]]; then
echo "Downloading Java 16"
curl -L -o java.tar.gz "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_$(echo $arch)_linux_hotspot_16.0.2_7.tar.gz"
curl -L -o java.tar.gz "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18%2B10/OpenJDK11U-jre_$(echo $arch)_linux_hotspot_16.0.2_7.tar.gz"
echo "Extracting Java 16"
tar -xzf java.tar.gz
echo "Moving Java 16 to $(echo $HOME)/.adoptium_java/jre16"
mv jdk-16.0.2+7 "$(echo $HOME)/.adoptium_java/jre16"
mv jdk-16.0.2+7-jre "$(echo $HOME)/.adoptium_java/jre16"
echo "Removing temporary files"
rm java.tar.gz
elif [[ $required_java == "17" ]]; then

View file

@ -37,9 +37,6 @@ function check_updates {
download_build=$latest_build
update_version=true
update_build=true
return
else
echo Checking for updates...
fi
# Check if $build is empty

View file

@ -1,3 +1,3 @@
#!/bin/bash
EXTRA_SCRIPTS_VERSION="v2.1.6"
EXTRA_SCRIPTS_VERSION="v1.1.2"

View file

@ -3,7 +3,7 @@
MAKEFLAGS += -s
all:
CURRENT_SCRIPT_VERSION=`grep "CURRENT_SCRIPT_VERSION=" msman.sh | sed -e "s/CURRENT_SCRIPT_VERSION=//g" | head -n -1`; \
CURRENT_SCRIPT_VERSION=`grep "CURRENT_SCRIPT_VERSION=" msman.sh | sed -e "s/CURRENT_SCRIPT_VERSION=//g"`; \
EXTRA_VERSION=`grep "EXTRA_SCRIPTS_VERSION=" .msman/version.sh | sed -e "s/EXTRA_SCRIPTS_VERSION=//g"`; \
if [ "$$CURRENT_SCRIPT_VERSION" != "$$EXTRA_VERSION" ]; then \
echo "ERROR: The version in msman.sh and .msman/version.sh are not the same!"; \
@ -13,7 +13,7 @@ all:
rm -rf msman
mkdir msman
cp -r .msman msman
tar -czf msman-helper.tar.gz msman
tar -czf msman-hepler.tar.gz msman
rm -rf msman
clean:

View file

@ -8,7 +8,7 @@ branch.
The project grew out of the scope I envisioned at first, surprisingly quickly LOL,
so I moved all my development here.
This project aims to support more Minecraft servers than just paper.
This project aims to support more minecraft servers rather than just paper.
## Features
@ -16,7 +16,7 @@ This project aims to support more Minecraft servers than just paper.
- Checks for the correct Java version installed
- Enables you to download a download a portable Java version from [Adoptium](https://adoptium.net/)
- The script downloads it to `~/.adoptium_java` allowing you to use one
- The script download's it to `~/.adoptium_java` allowing you to use one
Java downlaod across multiple server instances
- It also allows you to use multiple Java versions allowing you to run
multiple Minecraft servers requiring different Java versions
@ -39,12 +39,11 @@ This project aims to support more Minecraft servers than just paper.
#### Self-update
- This script can self-update itself without the need for user intervention
- This script can self-update itself without the need for user doing it manually
## Currently supported servers
- [Paper](https://papermc.io/)
- [Fabric](https://fabricmc.net/use/server/)
## Dependencies
@ -66,14 +65,14 @@ you're running something like Ubuntu.*
> undefined behavior and may cause the script to crash or perform unexpected actions.
>
> I strongly advise against making any modifications to the server's `.jar` file
> manually, as it may interfere with the functionality of this script.
> manually, as it may interfere with the proper functioning of this script.
## Basic setup
- Option 1: Oneliner
- Option 1: Run the script directly from GitHub
```bash
curl -sSL "https://raw.githubusercontent.com/jiriks74/msman.sh/main/msman.sh" -o msman.sh && chmod +x msman.sh && ./msman.sh
curl -sSL https://raw.githubusercontent.com/jiriks74/msman.sh/main/msman.sh | bash -s -- --redownload
```
- Option 2: Download `msman.sh` from release to where you want your minecraft

View file

@ -14,9 +14,7 @@
# I am not responsible for any loss of data #
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! #
# Supported server types:
# - paper
# - fabric
# Only paper is currently supported
server_type="paper"
version="1.19.3"
# Leave blank to use the latest build (auto updates on every run)
@ -40,7 +38,7 @@ mem="6000M"
# Flags for the server itself
# Usefull fot setting rcon password, server port, etc.
mc_launchoptions="nogui"
mc_launchoptions="-nogui"
# If you want to get rid of script updates notifications, set the below to false
check_for_script_updates=true

View file

@ -8,7 +8,7 @@ set -e
# and acknowledge the original script and author. #
#############################################################################################################
CURRENT_SCRIPT_VERSION="v2.1.6"
CURRENT_SCRIPT_VERSION="v1.1.2"
# --------------------------------------------------
# You shouldn't need to change anything in this file
@ -107,7 +107,7 @@ function ask_version_differs {
echo
echo
echo "The current server version differs from the one you selected."
echo "The server version is $current_version and the selected version is $version."
echo "The server version is $current_version and the selected version is $select_version."
echo "Do you want to update the server version?"
echo "This can cause many issues if you don't know what you are doing."
echo
@ -132,36 +132,6 @@ function ask_version_differs {
fi
}
# Ask if the new server version differs from the old one
function ask_server_type_differs {
echo
echo
echo "The current server type differs from the one you selected."
echo "The server version is $existing_server_type and the selected type is $server_type."
echo "Do you want to change the server type?"
echo "This can cause many issues if you don't know what you are doing."
echo
echo "I am not responsible for any data loss caused by changing the server type."
echo
echo "You have 15 seconds to respond, or the script will exit"
read -t 15 -p "Do you want to change the server type? [y/N] " type_differs
if [ "$type_differs" != "y" ] && [ "$type_differs" != "Y" ]; then
echo "Server type not changed."
echo "To start the server again with the server type, change the server type in the config to $existing_server_type."
exit 4
fi
if [ "$type_differs" == "y" ] || [ "$type_differs" == "Y" ]; then
read -t 15 -p "Are you sure you want to change the server type? [y/N] " type_differs
if [ "$type_differs" != "y" ] && [ "$type_differs" != "Y" ]; then
echo "Server type not changed."
echo "To start the server again with the server type, change the server type in the config to $existing_server_type."
exit 4
fi
fi
}
# Ask if the new server version differs from the old one
function ask_server_differs {
echo
@ -229,7 +199,7 @@ function launch_server {
echo "Starting the server..."
echo
echo
java $java_launchoptions -jar $server_file $mc_launchoptions
java $java_launchoptions -jar "$(basename ./paper-*.jar)" $mc_launchoptions
}
# Helper scripts update
@ -237,22 +207,18 @@ function helper_scripts_update {
# Download matching version of helper scripts
echo "Updating helper scripts..."
# Download the file into ms-man-helper.tar.gz
if [[ $(curl -sLJ -w '%{http_code}\n' "https://github.com/$REPO_OWNER/$REPO_NAME/releases/download/$CURRENT_SCRIPT_VERSION/msman-helper.tar.gz" -o msman-helper.tar.gz) == 200 ]]; then
if [[ $(curl -sLJ -w '%{http_code}\n' "https://github.com/jiriks74/msman.sh/releases/download/v1.0.0/ms-man-helper.tar.gz" -o msman-helper.tar.gz) == 200 ]]; then
# Extract the files from ms-man-helper.tar.gz
tar -xzf msman-helper.tar.gz
if [ -d .msman ]; then
# Remove the old scripts
echo "Removing old helper scripts..."
rm -rf .msman
echo "Removed old script"
fi
# Remove the old script
echo "Removing old helper scripts..."
rm -rf .msman
echo "Removed old script"
echo "Moving new helper scripts into place..."
mv msman/.msman .msman
mv msman .msman
echo "Removing temporary files..."
rm msman-helper.tar.gz
rm -rf msman
echo "Helper scripts updated successfully."
EXTRA_SCRIPTS_VERSION=$(echo $CURRENT_SCRIPT_VERSION)
echo
echo
else
@ -277,10 +243,9 @@ function self_update {
rm msman.sh
echo "Removed old script"
fi
echo "Moving new script into place..."
# Rename the new script
mv msman_new.sh msman.sh
echo "Moved new script into place"
echo "Renamed new script"
echo "Script updated successfully."
echo
else
@ -350,9 +315,10 @@ function check_self_update {
read -t 15 -p "Do you want to update? [y/N] " update
if [ "$update" == "y" ] || [ "$update" == "Y" ]; then
self_update
CURRENT_SCRIPT_VERSION=$LATEST_SCRIPT_VERSION
CURRENT_VERSION=$LATEST_SCRIPT_VERSION
check_helper_scripts
bash -c "$(pwd)/msman.sh"
ScriptLoc=$(readlink -f "$0")
./$ScriptLoc
else
echo "Skipping update."
return
@ -408,7 +374,7 @@ function load_config {
# Delete old server file with name $old_server_file
function delete_old_server {
# Delete the old server file
echo "Deleting old server file '$server_file...'"
echo "Deleting old server file $server_file..."
rm "$old_server_file"
echo "Old server file deleted."
}
@ -423,12 +389,12 @@ function load_script {
# Load the correct script
if [[ $server_type == "paper" ]]; then
source "./.msman/paper.sh"
elif [[ $server_type == "fabric" ]]; then
source "./.msman/fabric.sh"
# elif [[ $server_type == "vanilla" ]]; then
# source "$cwd/msman/vanilla.sh"
# elif [[ $server_type == "forge" ]]; then
# source "$cwd/msman/forge.sh"
# elif [[ $server_type == "fabric" ]]; then
# source "$cwd/msman/fabric.sh"
else
>&2 echo "Unknown server type."
echo "Exiting..."
@ -476,13 +442,6 @@ function main {
# Gets the installed server info
get_existing_server
# Check if the server type differs from the one in the config
if [[ $server_file != false ]]; then
if [[ $existing_server_type != $server_type ]]; then
ask_server_differs
fi
fi
# Check if the version and build are valid
check_version_valid
@ -498,13 +457,18 @@ function main {
# Check if this is the first run
first_run
# Set the java arguments
set_java_args
# Launch the server
launch_server
}
if [[ "$1" == "--edit-config" ]] || [[ "$1" == "-e" ]]; then
if [[ "$1" == "--redownload" ]] || [[ "$1" == "-r" ]]; then
get_latest_script_release
self_update
# Reload the script
ScriptLoc=$(readlink -f "$0")
./$ScriptLoc
exit 0
elif [[ "$1" == "--edit-config" ]] || [[ "$1" == "-e" ]]; then
if ! command -v $EDITOR &> /dev/null; then
echo "EDITOR is not set."
echo "Open 'msman.cfg' manually."
@ -514,10 +478,11 @@ if [[ "$1" == "--edit-config" ]] || [[ "$1" == "-e" ]]; then
exit 0
fi
elif [[ "$1" == "--help" ]] || [[ "$1" == "-h" ]]; then
echo "Usage: ./msman.sh [OPTION]"
echo "Usage: ./script.sh [OPTION]"
echo "Starts the Minecraft server."
echo
echo "Options:"
echo " -r, --redownload Redownloads the script from GitHub."
echo " -e, --edit-config Edit the config file."
echo " -h, --help Show this help message."
echo