Fix some tests

[einar-bin] / minecraft.sh

diff --git a/minecraft.sh b/minecraft.sh
index 93cdbdc44d197e58fdce63d1d13b2b943c846177..007e1470d9f0000440cc71d476ba59d07d9e0d58 100755 (executable)
--- a/minecraft.sh
+++ b/minecraft.sh
@@ -27,16 +27,29 @@ MC_COMMAND="java -Xmx2048M -Xms1024M -cp ${MC_LAUNCHER} net.minecraft.LauncherFr
 
 # This might be needed to fix 64bit java on Linux (path to your 64bit java libs)
 # Uncomment this if not suitable.
 
 # This might be needed to fix 64bit java on Linux (path to your 64bit java libs)
 # Uncomment this if not suitable.

-export LD_LIBRARY_PATH="/usr/lib/jvm/jre/lib/amd64/"
+export LD_LIBRARY_PATH="/usr/java/latest/lib/amd64/"

 
 
 # Here comes the code
 
 
 
 # Here comes the code
 

-if [ ${#} -ne 1 ]; then
-       echo "Usage: 'minecraft <version>'"
+UPDATEMC=0
+
+if [ ${#} -lt 1 ]; then
+       echo "Usage: 'minecraft <version>' or 'minecraft --add <version>'"

        exit 1
 fi
 
        exit 1
 fi
 

+if [ "${1}" == "--add" ]; then
+       if [ "${#}" -ne 2 ]; then
+               echo "You must supply what version you are adding: 'minecraft --add <version>'"
+               exit 1
+       else
+               MC_NEW_FOLDER="${MC_HOME}/bin-${2}"
+               read -p "Will save new bin-folder called bin-${2}, press update when prompted."
+               UPDATEMC=1
+       fi
+fi
+

 if [ -z ${MC_HOME} ]; then
        echo "Minecraft home folder not set! Baaaad idea!"
        exit 1
 if [ -z ${MC_HOME} ]; then
        echo "Minecraft home folder not set! Baaaad idea!"
        exit 1


@@ -47,11 +60,19 @@ if [ ! -d ${MC_HOME} ]; then
        exit 1
 fi
 
        exit 1
 fi
 

-MC_VERSION_FOLDER="${MC_HOME}/bin-${1}"
+if [ ${UPDATEMC} -ne 1 ]; then
+       MC_VERSION_FOLDER="${MC_HOME}/bin-${1}"
+else
+       MC_VERSION_FOLDER=$(ls -d ${MC_HOME}/bin-* | tail -n 1)
+fi
+

 MC_WORKING_FOLDER="${MC_HOME}/bin"
 
 if [ ! -d "${MC_VERSION_FOLDER}" ]; then
 MC_WORKING_FOLDER="${MC_HOME}/bin"
 
 if [ ! -d "${MC_VERSION_FOLDER}" ]; then

-       echo "Could not find that version folder (${MC_WORKING_FOLDER})."
+       echo "Could not find that version folder (${MC_VERSION_FOLDER})"
+       echo -e "\nAvailable Minecraft versions are:"
+       echo "---------------------------------"
+       ls -d ${MC_HOME}/bin-* | cut -d "-" -f 2

        exit 1
 fi
 
        exit 1
 fi
 


@@ -65,4 +86,7 @@ fi
 if [ ! -e "${MC_WORKING_FOLDER}" ]; then
        cp -r ${MC_VERSION_FOLDER} ${MC_WORKING_FOLDER}
         ${MC_COMMAND}
 if [ ! -e "${MC_WORKING_FOLDER}" ]; then
        cp -r ${MC_VERSION_FOLDER} ${MC_WORKING_FOLDER}
         ${MC_COMMAND}

+       if [ ${UPDATEMC} == 1 ]; then
+               cp -r ${MC_WORKING_FOLDER} ${MC_NEW_FOLDER}
+       fi

 fi
 fi