From 7e19a9b9b73231c7ab772fa52f20fa47bdd20aa2 Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Mon, 29 Feb 2016 13:26:39 -0500
Subject: [PATCH] working on official minetest mapper call

---
 chunkymap-regen.py             | 2 +-
 install-chunkymap-on-ubuntu.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chunkymap-regen.py b/chunkymap-regen.py
index 25a8682..c644008 100644
--- a/chunkymap-regen.py
+++ b/chunkymap-regen.py
@@ -610,7 +610,7 @@ class MTChunks:
             #where geometry option is like --geometry x:y+w+h
             output_type_string = "minetest-mapper"
             #NOTE: minetest-mapper is part of the minetest-data package, which can be installed alongside the git version of minetestserver
-            cmd_string = "minetest-mapper --input \""+self.world_path+"\" --draworigin --geometry "+str(x_min)+":"+str(z_min)+"+"+str(int(x_max)-int(x_min))+"+"+str(int(z_max)-int(z_min))+" --output \""+tmp_png_path+"\""
+            cmd_string = "minetest-mapper --input \""+self.world_path+"\" --draworigin --geometry "+str(x_min)+":"+str(z_min)+"+"+str(int(x_max)-int(x_min))+"+"+str(int(z_max)-int(z_min))+" --output \""+tmp_png_path+"\""+cmd_suffix
         dest_png_path = self.get_chunk_image_path(chunk_luid)
         #is_empty_chunk = is_chunk_yaml_marked(chunk_luid) and is_chunk_yaml_marked_empty(chunk_luid)
         print ("Running generator for: "+str((x,z)))
diff --git a/install-chunkymap-on-ubuntu.sh b/install-chunkymap-on-ubuntu.sh
index 7ef4743..e283cb6 100644
--- a/install-chunkymap-on-ubuntu.sh
+++ b/install-chunkymap-on-ubuntu.sh
@@ -41,7 +41,7 @@ cp -f "$CHUNKYMAP_INSTALLER_PATH/unused/chunkymap-players-cronjob" "$CHUNKYMAP_D
 cp -f "$CHUNKYMAP_INSTALLER_PATH/unused/set-minutely-players-crontab-job.sh" "$CHUNKYMAP_DEST/unused/"
 cp -f "$CHUNKYMAP_INSTALLER_PATH/unused/set-minutely-crontab-job.sh" "$CHUNKYMAP_DEST/unused/"
 cp -f "$CHUNKYMAP_INSTALLER_PATH/chunkymap-regen-loop.sh" "$CHUNKYMAP_DEST/"
-cp --no-clobber "$CHUNKYMAP_INSTALLER_PATH/chunkymap-signals*" "$CHUNKYMAP_DEST/"
+cp --no-clobber $CHUNKYMAP_INSTALLER_PATH/chunkymap-signals* "$CHUNKYMAP_DEST/"
 cd "$CHUNKYMAP_INSTALLER_PATH"
 python replace-with-current-user.py  # the py file only manipulates the minetest/util directory
 # so chmod those files AFTER running the py above (since it rewrites them and therefore removes x attribute if present):