diff --git a/install.sh b/install.sh index def4586aa..62ec336a3 100755 --- a/install.sh +++ b/install.sh @@ -22,7 +22,7 @@ DEBUG=0 #----------------------------------------------Constants----------------------------------------------# # Suported versions of python using only major.minor format -PySupported=("3.8" "3.9" "3.10" "3.11" "3.12") +PySupported=("3.13" "3.12" "3.11" "3.10" "3.9" "3.8") PyBin="python3" # Path updated by find_python PyBinPath="$(command -v "$PyBin")" @@ -195,7 +195,7 @@ function find_python() { if [[ $PY_VER_MINOR -eq 8 ]]; then # if 3.8, patch version minimum is 3.8.7 if [[ $PY_VER_PATCH -ge 7 ]]; then - PyBinPath="$(command -v "$PyBinTest")" + PyBinPath="$(which "$PyBinTest")" PyBin="$PyBinTest" debug "Selected: $PyBinTest @ $PyBinPath" return 0 @@ -203,7 +203,7 @@ function find_python() { fi # if 3.9+ it should work. if [[ $PY_VER_MINOR -ge 9 ]]; then - PyBinPath="$(command -v "$PyBinTest")" + PyBinPath="$(which "$PyBinTest")" PyBin="$PyBinTest" debug "Selected: $PyBinTest @ $PyBinPath" return 0 @@ -211,7 +211,7 @@ function find_python() { fi done - PyBinPath="$(command -v "python3")" + PyBinPath="$(which "python3")" PyBin="python3" debug "Default: python3 @ $PyBinPath" return 1 @@ -586,13 +586,14 @@ function debug() { function configure_bot() { echo "You can now configure MusicBot!" read -rp "Would like to launch the 'configure.py' tool? [N/y]" YesConfig - if [ "${YesConfig,,}" != "y" ] && [ "${YesConfig,,}" != "yes" ] ; then + if [[ "${YesConfig,,}" != "y" && "${YesConfig,,}" != "yes" ]] ; then + echo "" echo "Open the 'config' directory, then copy and rename the example files to get started." echo "Make sure to add your Bot token to the options.ini 'Token' option before starting." return fi - $PyBin "${InstallDir}/configure.py" + $PyBin "configure.py" } #------------------------------------------CLI Arguments----------------------------------------------# diff --git a/run.sh b/run.sh index 0bb064be6..f2c77c0e3 100755 --- a/run.sh +++ b/run.sh @@ -21,7 +21,7 @@ if [ -f "../bin/activate" ] ; then fi # Suported versions of python using only major.minor format -PySupported=("3.8" "3.9" "3.10" "3.11" "3.12") +PySupported=("3.13" "3.12" "3.11" "3.10" "3.9""3.8") # compile a list of bin names to try for. PyBins=("python3") # We hope that python3 maps to a good version. diff --git a/update.sh b/update.sh index ab532be29..d07b89df6 100755 --- a/update.sh +++ b/update.sh @@ -20,7 +20,7 @@ if [ -f "../bin/activate" ] ; then fi # Suported versions of python using only major.minor format -PySupported=("3.8" "3.9" "3.10" "3.11" "3.12") +PySupported=("3.13" "3.12" "3.11" "3.10" "3.9""3.8") # compile a list of bin names to try for. PyBins=("python3") # We hope that python3 maps to a good version.