From dbb8db3ab84fb518faedc843cec336cb2daf21f1 Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Fri, 19 Feb 2016 14:37:42 -0500
Subject: [PATCH] working on installer

---
 install-chunkymap-on-ubuntu-from-web.sh | 13 +++++++++++--
 install-chunkymap-on-ubuntu.sh          | 11 ++++++++---
 update-chunkymap-installer-only.sh      | 13 +++++++++++--
 update-chunkymap-on-ubuntu-from-web.sh  | 16 ++++++++++++----
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/install-chunkymap-on-ubuntu-from-web.sh b/install-chunkymap-on-ubuntu-from-web.sh
index 583cd4b..453f0df 100644
--- a/install-chunkymap-on-ubuntu-from-web.sh
+++ b/install-chunkymap-on-ubuntu-from-web.sh
@@ -1,9 +1,15 @@
 #!/bin/sh
-CHUNKYMAP_INSTALLER_DIR=~/minetest-stuff/minetest-chunkymap
+cd ~
+rm -Rf ~/minetest-stuff/minetest-chunkymap
+CHUNKYMAP_INSTALLER_DIR=~/Downloads/minetest-chunkymap
+if [ ! -d "~/Downloads" ]; then
+	mkdir "~/Downloads"
+fi
+
 chmod +x update-chunkymap-installer-only.sh
 
 #./update-chunkymap-installer-only.sh:
-cd ~/minetest-stuff
+cd ~/Downloads
 rm master.zip
 wget https://github.com/expertmm/minetest-chunkymap/archive/master.zip
 rm -f minetest-chunkymap.zip
@@ -18,6 +24,9 @@ chmod +x "$CHUNKYMAP_INSTALLER_DIR/install-chunkymap-on-ubuntu.sh"
 chmod +x "$CHUNKYMAP_INSTALLER_DIR/update-chunkymap-installer-only.sh"
 chmod +x "$CHUNKYMAP_INSTALLER_DIR/update-chunkymap-on-ubuntu-from-web.sh"
 
+#mv -f "$CHUNKYMAP_INSTALLER_DIR/install-chunkymap-on-ubuntu.sh" "~/Downloads/"
+mv -f "$CHUNKYMAP_INSTALLER_DIR/update-chunkymap-on-ubuntu-from-web.sh" "~/Downloads/"
+
 
 chmod +x "$CHUNKYMAP_INSTALLER_DIR/install-chunkymap-on-ubuntu.sh"
 sh "$CHUNKYMAP_INSTALLER_DIR/install-chunkymap-on-ubuntu.sh"
\ No newline at end of file
diff --git a/install-chunkymap-on-ubuntu.sh b/install-chunkymap-on-ubuntu.sh
index 8c57eb6..feb04ae 100644
--- a/install-chunkymap-on-ubuntu.sh
+++ b/install-chunkymap-on-ubuntu.sh
@@ -1,10 +1,15 @@
 #!/bin/sh
-CHUNKYMAP_INSTALLER_DIR=~/minetest-stuff/minetest-chunkymap
+cd ~
+rm -Rf ~/minetest-stuff/minetest-chunkymap
+CHUNKYMAP_INSTALLER_DIR=~/Downloads/minetest-chunkymap
+if [ ! -d "~/Downloads" ]; then
+	mkdir "~/Downloads"
+fi
 
 MINETEST_UTIL=$HOME/minetest/util
 CHUNKYMAP_DEST=$MINETEST_UTIL
 
-#cd ~
+#cd ~/Downloads
 #rm -f ~/minetestmapper-numpy.py
 #wget https://github.com/spillz/minetest/raw/master/util/minetestmapper-numpy.py
 #since colors.txt is in ~/minetest/util:
@@ -22,7 +27,7 @@ chmod +x "$CHUNKYMAP_DEST/chunkymap-cronjob"
 cp -f "$CHUNKYMAP_INSTALLER_DIR/set-minutely-crontab-job.sh" "$CHUNKYMAP_DEST/"
 chmod +x "$CHUNKYMAP_DEST/set-minutely-crontab-job.sh"
 cd "$CHUNKYMAP_INSTALLER_DIR"
-python replace-with-current-user.py
+python replace-with-current-user.py  # the py file only manipulates the minetest/util folder
 
 sudo apt-get install python-numpy python-pil
 
diff --git a/update-chunkymap-installer-only.sh b/update-chunkymap-installer-only.sh
index 7e59c64..ad9cb72 100644
--- a/update-chunkymap-installer-only.sh
+++ b/update-chunkymap-installer-only.sh
@@ -1,7 +1,12 @@
 #!/bin/sh
-CHUNKYMAP_INSTALLER_DIR=~/minetest-stuff/minetest-chunkymap
+cd ~
+rm -Rf ~/minetest-stuff/minetest-chunkymap
+CHUNKYMAP_INSTALLER_DIR=~/Downloads/minetest-chunkymap
+if [ ! -d "~/Downloads" ]; then
+	mkdir "~/Downloads"
+fi
 
-cd ~/minetest-stuff
+cd ~/Downloads
 rm master.zip
 wget https://github.com/expertmm/minetest-chunkymap/archive/master.zip
 rm -f minetest-chunkymap.zip
@@ -15,3 +20,7 @@ mv minetest-chunkymap-master "$CHUNKYMAP_INSTALLER_DIR"
 chmod +x "$CHUNKYMAP_INSTALLER_DIR/install-chunkymap-on-ubuntu.sh"
 chmod +x "$CHUNKYMAP_INSTALLER_DIR/update-chunkymap-installer-only.sh"
 chmod +x "$CHUNKYMAP_INSTALLER_DIR/update-chunkymap-on-ubuntu-from-web.sh"
+
+#mv -f "$CHUNKYMAP_INSTALLER_DIR/install-chunkymap-on-ubuntu.sh" "~/Downloads/"
+mv -f "$CHUNKYMAP_INSTALLER_DIR/update-chunkymap-on-ubuntu-from-web.sh" "~/Downloads/"
+
diff --git a/update-chunkymap-on-ubuntu-from-web.sh b/update-chunkymap-on-ubuntu-from-web.sh
index f275275..2642fda 100644
--- a/update-chunkymap-on-ubuntu-from-web.sh
+++ b/update-chunkymap-on-ubuntu-from-web.sh
@@ -1,8 +1,16 @@
 #!/bin/sh
-CHUNKYMAP_INSTALLER_DIR=~/minetest-stuff/minetest-chunkymap
-cd $CHUNKYMAP_INSTALLER_DIR
+cd ~
+rm -Rf ~/minetest-stuff/minetest-chunkymap
+CHUNKYMAP_INSTALLER_DIR=~/Downloads/minetest-chunkymap
+if [ ! -d "~/Downloads" ]; then
+	mkdir "~/Downloads"
+fi
+
+#cd $CHUNKYMAP_INSTALLER_DIR
 chmod +x update-chunkymap-installer-only.sh
-./update-chunkymap-installer-only.sh
+cd ~/Downloads
+mv -f "$CHUNKYMAP_INSTALLER_DIR/update-chunkymap-installer-only.sh"
+sh "$CHUNKYMAP_INSTALLER_DIR/update-chunkymap-installer-only.sh"
 #./install-chunkymap-on-ubuntu.sh
 chmod +x "$CHUNKYMAP_INSTALLER_DIR/install-chunkymap-on-ubuntu.sh"
-./install-chunkymap-on-ubuntu.sh
\ No newline at end of file
+sh "$CHUNKYMAP_INSTALLER_DIR/install-chunkymap-on-ubuntu.sh"
\ No newline at end of file