From 628bbb3ba2fd30c5d7c0113fc8ee1809aca80af3 Mon Sep 17 00:00:00 2001
From: ihaveamac <ian@ianburgwin.net>
Date: Fri, 15 Apr 2016 14:20:12 -0700
Subject: [PATCH] stop hanging checking commands, fix for Windows when renaming
 final CIA

---
 3dsconv.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/3dsconv.py b/3dsconv.py
index 59d28ef..39fbe44 100755
--- a/3dsconv.py
+++ b/3dsconv.py
@@ -8,7 +8,7 @@
 output_directory = ""
 
 #################
-version = "2.0"
+version = "2.01"
 
 helptext = """3dsconv.py ~ version %s
 https://github.com/ihaveamac/3dsconv
@@ -29,13 +29,20 @@
   or in the directory specified by --xorpads=<dir>
 - encrypted and decrypted roms can be converted at the same time"""
 
+cleanup = not "--nocleanup" in sys.argv
+verbose = "--verbose" in sys.argv
+
 def print_v(msg):
 	if verbose:
 		print(msg)
 
 def testcommand(cmd):
+	print_v("- testing: %s" % cmd)
 	try:
-		proc = subprocess.Popen([cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE).wait()
+		proc = subprocess.Popen([cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+		proc.stdout.close()
+		proc.stderr.close()
+		proc.wait()
 		return True
 	except OSError as e:
 		if e.errno != 2:
@@ -102,9 +109,6 @@ def docleanup(tid):
 	if not os.path.isdir("work"):
 		raise
 
-cleanup = not "--nocleanup" in sys.argv
-verbose = "--verbose" in sys.argv
-
 # probably should've used argparse
 for arg in sys.argv[1:]:
 	if arg[:2] != "--":
@@ -219,6 +223,8 @@ def docleanup(tid):
 	runcommand(cmds)
 	os.chdir("..")
 
+	# apparently if the file exists, it will throw an error on Windows
+	silentremove(os.path.join(output_directory, romname+".cia"))
 	os.rename("work/%s-game-conv.cia" % tid, os.path.join(output_directory, romname+".cia"))
 	if cleanup:
 		docleanup(tid)