@@ 75,10 75,11 @@ if __name__ == "__main__":
 		help = "Which architecture to build for")
 	parser.add_argument("-c", "--configuration", metavar="<path>", type=str, default="system-config.json",
 		help = "path to build system configuration file (.json)")
+	parser.add_argument("-s", "--show", default=False, action="store_true", help="Print the merged configuration to stdout")
 	parser.add_argument("jobs", metavar='<job.json>', type=str, nargs ="+", help = "path to manifest")
 
 	args = vars(parser.parse_args())
-	config.initialize(args["configuration"])
+	config.initialize(args["configuration"],args["show"])
 
 	arch = importlib.import_module(args["architecture"])
 	cfg["builder_assets"] = script_dir + "/" + args["architecture"]

          
@@ 97,5 98,5 @@ if __name__ == "__main__":
 			print(job["log"])
 
 		if artifact: 
-			shutil.move(artifact, user_dir)
+			os.rename(artifact, user_dir + "/" + artifact)
 			print("- Created %s" % artifact)

          

@@ 1,4 1,4 @@ 
-import json, platform, sys, os
+import json, platform, sys, os, pprint
 
 cfg = {}
 

          
@@ 10,10 10,17 @@ def merge_config(filename):
 		if to_merge:
 			cfg.update(to_merge)
 
-def initialize(config_file):
+def initialize(config_file, print_config = False):
 	cfg["platform"] = [platform.system() + " " + platform.release(), platform.machine(), platform.version()]
 	cfg["python"] = sys.executable.replace("\\","/")
 	cfg["common_assets"] = os.path.dirname(os.path.realpath(__file__)).replace("\\","/") + "/Common"
 
 	merge_config("system-defaults.json")
 	merge_config(config_file)
+
+	if print_config:
+		cshow = dict(cfg)
+		if "password" in cshow:
+			cshow["password"] = "*" * len(cshow["password"])
+		
+		pprint.pprint(cshow)

          

@@ 78,19 78,12 @@ def range_query(start, end = None):
 		urllib.quote_plus(json.dumps(start)),
 		urllib.quote_plus(json.dumps(end)))
 
-config.initialize(args["configuration"])
+config.initialize(args["configuration"], args["show"])
 
 if args["define"] is not None:
 	for item in args["define"]:
 		cfg[item[0]] = item[1]
 
-if (args["show"]):
-	cshow = dict(cfg)
-	if "password" in cshow:
-		cshow["password"] = "*" * len(cshow["password"])
-	pprint.pprint(cshow)
-
-
 if "password" in cfg:
 	authorization_header = "Basic " + base64.b64encode(cfg.pop("username","") + ":" + cfg.pop("password", ""))