From 7cc6b8e63bb184ab25cefed3cf7c67087728b68c Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Tue, 22 Mar 2016 20:21:42 -0400
Subject: [PATCH] more renaming

---
 install-chunkymap-on-ubuntu-from-web.sh | 3 ---
 install-chunkymap-on-ubuntu.sh          | 4 ----
 rename-deprecated.sh                    | 5 +++++
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/install-chunkymap-on-ubuntu-from-web.sh b/install-chunkymap-on-ubuntu-from-web.sh
index 4417f8f..c972feb 100644
--- a/install-chunkymap-on-ubuntu-from-web.sh
+++ b/install-chunkymap-on-ubuntu-from-web.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
 cd $HOME
-if [ -d "$HOME/minetest-stuff/minetest-chunkymap" ]; then
-  rm -Rf $HOME/minetest-stuff/minetest-chunkymap
-fi
 CHUNKYMAP_INSTALLER_DIR=$HOME/Downloads/minetest-chunkymap
 if [ ! -d "$HOME/Downloads" ]; then
 	mkdir "$HOME/Downloads"
diff --git a/install-chunkymap-on-ubuntu.sh b/install-chunkymap-on-ubuntu.sh
index 834edc0..8a7ea63 100644
--- a/install-chunkymap-on-ubuntu.sh
+++ b/install-chunkymap-on-ubuntu.sh
@@ -1,10 +1,6 @@
 #!/bin/sh
 cd $HOME
 MT_MY_WEBSITE_PATH=/var/www/html/minetest
-if [ -d "$HOME/minetest-stuff/minetest-chunkymap" ]; then
-  #remove deprecated path:
-  rm -Rf $HOME/minetest-stuff/minetest-chunkymap
-fi
 CHUNKYMAP_INSTALLER_PATH=$HOME/Downloads/minetest-chunkymap
 if [ ! -d "$HOME/Downloads/minetest-chunkymap" ]; then
   echo "please run install-chunkymap-on-ubuntu-from-web.sh or update-chunkymap-installer-only.sh first.";
diff --git a/rename-deprecated.sh b/rename-deprecated.sh
index 3818023..0159b46 100644
--- a/rename-deprecated.sh
+++ b/rename-deprecated.sh
@@ -13,6 +13,11 @@ else
   cp -f "$CHUNKYMAP_DEPRECATED_PATH/colors.txt" "$CHUNKYMAP_DEST_PATH/colors (base).txt"
 fi
 
+if [ -d "$HOME/minetest-stuff/minetest-chunkymap" ]; then
+  #remove deprecated path:
+  rm -Rf $HOME/minetest-stuff/minetest-chunkymap
+fi
+
 mv "$CHUNKYMAP_DEPRECATED_PATH/web" "$CHUNKYMAP_DEST_PATH/web"
 mv "$CHUNKYMAP_DEPRECATED_PATH/unused" "$CHUNKYMAP_DEST_PATH/unused"
 mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-genresults" "$CHUNKYMAP_DEST_PATH/chunkymap-genresults"