From af7926cf9863343a43b3673ab2d3fbe27f3e88ea Mon Sep 17 00:00:00 2001
From: Leon Krause <lk@leonkrause.com>
Date: Thu, 10 May 2018 20:17:51 +0200
Subject: [PATCH 1/3] Allow exporting runnable presets from command line

---
 editor/editor_node.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index fd5a6dffc99..3f0a09cfd9a 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -483,7 +483,7 @@ void EditorNode::_fs_changed() {
 				// come during the export
 				export_defer.preset = "";
 				Error err = OK;
-				if (!preset->is_runnable() && (export_defer.path.ends_with(".pck") || export_defer.path.ends_with(".zip"))) {
+				if (export_defer.path.ends_with(".pck") || export_defer.path.ends_with(".zip")) {
 					if (export_defer.path.ends_with(".zip")) {
 						err = platform->export_zip(preset, export_defer.debug, export_defer.path);
 					} else if (export_defer.path.ends_with(".pck")) {

From 942f6dfbd66c1d15a45ef6447fd883103d9678a8 Mon Sep 17 00:00:00 2001
From: Leon Krause <lk@leonkrause.com>
Date: Thu, 10 May 2018 20:18:43 +0200
Subject: [PATCH 2/3] Fix custom resource path look-up per command line

---
 main/main.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/main/main.cpp b/main/main.cpp
index 1c5540fd197..dfc75f1b29c 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -337,7 +337,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 
 	String video_driver = "";
 	String audio_driver = "";
-	String game_path = ".";
+	String game_path;
 	bool upwards = false;
 	String debug_mode;
 	String debug_host;
@@ -693,6 +693,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		I = N;
 	}
 
+	if (game_path.empty()) {
+		game_path = ".";
+	}
 	if (globals->setup(game_path, main_pack, upwards) == OK) {
 		found_project = true;
 	} else {

From c4c7270cc7108e514b596dd7f4aac53810f0186d Mon Sep 17 00:00:00 2001
From: Leon Krause <lk@leonkrause.com>
Date: Thu, 10 May 2018 20:23:36 +0200
Subject: [PATCH 3/3] Fix help/man for --export and --export-debug

---
 main/main.cpp           | 4 ++--
 misc/dist/linux/godot.6 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/main.cpp b/main/main.cpp
index dfc75f1b29c..8fce88b22f9 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -262,8 +262,8 @@ void Main::print_help(const char *p_binary) {
 	OS::get_singleton()->print("Standalone tools:\n");
 	OS::get_singleton()->print("  -s, --script <script>            Run a script.\n");
 #ifdef TOOLS_ENABLED
-	OS::get_singleton()->print("  --export <target>                Export the project using the given export target.\n");
-	OS::get_singleton()->print("  --export-debug                   Use together with --export, enables debug mode for the template.\n");
+	OS::get_singleton()->print("  --export <target>                Export the project using the given export target. Export only main pack if path ends with .pck or .zip'.\n");
+	OS::get_singleton()->print("  --export-debug <target>          Like --export, but use debug template.\n");
 	OS::get_singleton()->print("  --doctool <path>                 Dump the engine API reference to the given <path> in XML format, merging if existing files are found.\n");
 	OS::get_singleton()->print("  --no-docbase                     Disallow dumping the base types (used with --doctool).\n");
 	OS::get_singleton()->print("  --build-solutions                Build the scripting solutions (e.g. for C# projects).\n");
diff --git a/misc/dist/linux/godot.6 b/misc/dist/linux/godot.6
index 26ebe01af73..64495d817eb 100644
--- a/misc/dist/linux/godot.6
+++ b/misc/dist/linux/godot.6
@@ -128,10 +128,10 @@ Print the frames per second to the stdout.
 Run a script.
 .TP
 \fB\-\-export\fR <target>
-Export the project using the given export target.
+Export the project using the given export target. Export only main pack if path ends with .pck or .zip.
 .TP
 \fB\-\-export\-debug\fR
-Use together with \fB\-\-export\fR, enables debug mode for the template.
+Like \-\-export, but use debug template.
 .TP
 \fB\-\-doctool\fR <path>
 Dump the engine API reference to the given <path> in XML format, merging if existing files are found.