From 080c0bc5b270df1dabd280baa6ed9b861a7b53e4 Mon Sep 17 00:00:00 2001
From: Lethosor <lethosor@users.noreply.github.com>
Date: Wed, 17 Dec 2014 17:12:10 -0500
Subject: [PATCH 1/2] Revert "Log output of "dfhack" script to dfhack.log"

---
 package/darwin/dfhack | 2 +-
 package/linux/dfhack  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/darwin/dfhack b/package/darwin/dfhack
index 814ecd013..55aa81a98 100755
--- a/package/darwin/dfhack
+++ b/package/darwin/dfhack
@@ -12,6 +12,6 @@ fi
 
 old_tty_settings=$(stty -g)
 cd "${PWD}"
-DYLD_INSERT_LIBRARIES=./hack/libdfhack.dylib ./dwarfort.exe "$@" 2>&1 | tee dfhack.log
+DYLD_INSERT_LIBRARIES=./hack/libdfhack.dylib ./dwarfort.exe "$@"
 stty "$old_tty_settings"
 echo ""
diff --git a/package/linux/dfhack b/package/linux/dfhack
index 44677d87e..4fa3e20e7 100755
--- a/package/linux/dfhack
+++ b/package/linux/dfhack
@@ -65,7 +65,7 @@ case "$1" in
     ret=$?
     ;;
   *)
-    setarch i386 -R env LD_PRELOAD=$PRELOAD_LIB ./libs/Dwarf_Fortress "$@" 2>&1 | tee dfhack.log
+    setarch i386 -R env LD_PRELOAD=$PRELOAD_LIB ./libs/Dwarf_Fortress "$@"
     ret=$?
     ;;
 esac

From 695f04a51d3a3b7f0c4c448c4e4f0a262fae5918 Mon Sep 17 00:00:00 2001
From: Lethosor <lethosor@users.noreply.github.com>
Date: Wed, 17 Dec 2014 21:26:01 -0500
Subject: [PATCH 2/2] Delete embark.lua

This has been replaced by embark-tools, and there have been reports of this not working in 0.40.xx (http://www.bay12forums.com/smf/index.php?topic=139553.msg5885446#msg5885446)
---
 scripts/embark.lua | 53 ----------------------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 scripts/embark.lua

diff --git a/scripts/embark.lua b/scripts/embark.lua
deleted file mode 100644
index f3609683c..000000000
--- a/scripts/embark.lua
+++ /dev/null
@@ -1,53 +0,0 @@
--- lets you embark anywhere.
-helpstring=[[ embark [-t|-d|-e|-h]
- -t   test if the patch can be applied
- -d   disable the patch if enabled
- -e   enable the patch if disabled
- -h   shows help
-]]
-args={...}
-if args[1]=="-h" then
-    print(helpstring)
-    return
-end
-local ms=require("memscan")
-local dfu=require("plugins.dfusion")
-local patch
-function embark() --windows only?
-	local seg=ms.get_code_segment()
-	local idx,off
-    local patch=dfu.patches.embark_anywhere
-	if patch~=nil then
-       return patch
-    else
-        idx,off=seg.uint8_t:find_one{0x66, 0x83, 0x7F ,0x1A ,0xFF,0x74,0x04}
-        if idx then
-            patch=dfu.BinaryPatch{name="embark_anywhere",pre_data={0x74,0x04},data={0x90,0x90},address=off+5}
-            return patch
-        else
-            qerror("Offset for embark patch not found!")
-        end
-    end
-end
-patch=embark()
-if args[1]=="-t" then
-    if patch:test() and not patch.is_applied then
-        print("all okay, patch can be applied")
-    elseif patch.is_applied then
-        print("patch is currently applied, can be removed")
-    else
-        qerror("patch can't be applied")
-    end
-elseif args[1]=="-d" then
-    if patch.is_applied then
-        patch:remove()
-        print("patch removed")
-    end
-elseif args[1]=="-e" then
-    if not patch.is_applied then
-        patch:apply()
-        print("patch applied")
-    end
-else
-    print(helpstring)
-end
\ No newline at end of file