[install.sh] Fix how to find nalc.conf

This commit is contained in:
bri cassa 2022-06-25 16:07:34 +02:00
parent 23084263ce
commit eaccc5b2e5

View File

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