diff --git a/install.sh b/install.sh index 2fa0228..bf4d1e6 100755 --- a/install.sh +++ b/install.sh @@ -360,7 +360,10 @@ post_install() { action() { echo "Preparing the installation…" + SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd) DESTINATION="$1" + [ -z $DESTINATION ] && DESTINATION="$SCRIPT_DIR" + GIT=$(which git) CMAKE=$(which cmake) MAKE=$(which make) @@ -386,9 +389,6 @@ action() { [[ $URL =~ ^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]+$ ]] && URL="$URL:" [ -z $BRANCH ] && BRANCH="stable" [ -z $WORLD_NAME ] && WORLD_NAME="nalc" - - SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd) - [ -z $DESTINATION ] && DESTINATION="$SCRIPT_DIR" [ ! -e $MINETEST_BIN ] && error "$MINETEST_BIN not found" [ ! -d $MINETEST_DIR ] && error "$MINETEST_DIR not found"