From 0ae73af79551601487146cad6203f49c2d5bfd0f Mon Sep 17 00:00:00 2001
From: sys4 <bricassa@sys4.fr>
Date: Sun, 25 Sep 2022 15:15:21 +0200
Subject: [PATCH] Minor tweak of install.sh & update news

---
 install.sh            | 8 ++++++--
 world/news-dev.txt    | 2 +-
 world/news-stable.txt | 5 +++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index c07c270..3e1ce63 100755
--- a/install.sh
+++ b/install.sh
@@ -181,7 +181,7 @@ install_mods() {
 install_world() {
     local world_dir="$MINETEST_DIR/worlds/$WORLD_NAME"
     if [ -d "$world_dir" ]; then
-	echo "$WORLD_NAME already exist."
+	echo "World $WORLD_NAME already exist."
 	read -p "Upgrade $WORLD_NAME? ([Y]es/[n]o/[c]lean) " continue
 	case "$continue" in
 	    [yY][eE][sS]|[yY]|"")
@@ -196,6 +196,10 @@ install_world() {
 		mv "$world_dir" "$world_dir"_old
 		verif
 		;;
+	    [nN][oO]|[nN])
+		echo "Skiping…"
+		return
+		;;
 	esac
     fi
     if [ ! -d "$world_dir" ]; then
@@ -366,7 +370,7 @@ post_install() {
     echo -e "\t- $DESTINATION/mods_disabled.txt"
     echo
     
-    if [ $MINETEST_MAPPER -eq 1 ]; then
+    if [[ $MINETEST_MAPPER -eq 1 ]]; then
 	echo "The use of Minetest Mapper needs ImageMagick with fontconfig and truetype dependencies."
 	echo "You also need to allow read and write permissions for PS. The configuration can be found in the file that manage the security policy of ImageMagick."
     fi
diff --git a/world/news-dev.txt b/world/news-dev.txt
index 3511148..18eeaa4 100644
--- a/world/news-dev.txt
+++ b/world/news-dev.txt
@@ -2,7 +2,7 @@
 
   Pour voir le détail d'une révision, se rendre sur https://sys4.fr/gitea puis aller dans le dépôt nalc-server-mods de l'organisation nalc. Dans la vue des révisions vous pouvez chercher la description d'une révision dont le numéro se trouve dans le tableaux des révisions ci-dessous :
 
-===] 1.6.0/master/dev [===
+===] 1.6.1/1.6.0/master/dev [===
 
 * Révision| Date    | Description
 —————————————————————————————————————————
diff --git a/world/news-stable.txt b/world/news-stable.txt
index d374daf..9ef683c 100644
--- a/world/news-stable.txt
+++ b/world/news-stable.txt
@@ -4,6 +4,11 @@
 
 --=| NOTES DE VERSIONS / CHANGELOG |=--
 
+===] 1.6.1 [===
+
+*** CHANGES & ADDITIONS ****
+* Minetest 5.6.1
+
 ===] 1.6.0 [===
 
 **** CHANGES & ADDITIONS ****