From 72925c095a889bf2c0c9860003bd4d06171e9b66 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Mon, 17 Jul 2017 16:33:36 -0700
Subject: [PATCH] Fix for local haxelib 'rebuild tools' command

---
 tools/RunScript.hx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/RunScript.hx b/tools/RunScript.hx
index 40dfe64bd..c11db83e0 100644
--- a/tools/RunScript.hx
+++ b/tools/RunScript.hx
@@ -176,10 +176,10 @@ class RunScript {
 			if (FileSystem.exists (lastArgument) && FileSystem.isDirectory (lastArgument)) {
 				
 				Sys.setCwd (lastArgument);
-				args.pop ();
 				
 			}
 			
+			HaxelibHelper.workingDirectory = Sys.getCwd ();
 			var rebuildBinaries = true;
 			
 			for (arg in args) {
@@ -224,13 +224,13 @@ class RunScript {
 			
 			rebuildTools (rebuildBinaries);
 			
-			if (args[args.length - 1] != "-openfl") {
+			if (args.indexOf ("-openfl") > -1) {
 				
-				Sys.exit (0);
+				Sys.setCwd (cacheDirectory);
 				
 			} else {
 				
-				Sys.setCwd (cacheDirectory);
+				Sys.exit (0);
 				
 			}