Added default torrent, fixed makefile, Popen

ArmoryQt.py

@@ -1899,7 +1899,7 @@ def findTorrentFileForSDM(self, forceWaitTime=0):
 
       # If it's still not there, look for a default file
       if self.announceFetcher.getFileModTime('bootstrap') == 0:
-         srcTorrent = os.path.join(GetExecDir(), 'default_bootstrap.torrent')
+         srcTorrent = os.path.join(GetExecDir(), '../default_bootstrap.torrent')
       else:
          srcTorrent = self.announceFetcher.getAnnounceFilePath('bootstrap')
 

Makefile

@@ -17,13 +17,16 @@ install : all
 	mkdir -p $(DESTDIR)$(PREFIX)/lib/armory/extras
 	mkdir -p $(DESTDIR)$(PREFIX)/lib/armory/jsonrpc
 	mkdir -p $(DESTDIR)$(PREFIX)/lib/armory/ui
+	mkdir -p $(DESTDIR)/lib/armory/BitTornado/BT1
 	cp *.py *.so README $(DESTDIR)$(PREFIX)/lib/armory/
 	rsync -rupE armoryengine $(DESTDIR)$(PREFIX)/lib/armory/
 	rsync -rupE img $(DESTDIR)$(PREFIX)/share/armory/
 	cp extras/*.py $(DESTDIR)$(PREFIX)/lib/armory/extras
 	cp jsonrpc/*.py $(DESTDIR)$(PREFIX)/lib/armory/jsonrpc
 	cp ui/*.py $(DESTDIR)$(PREFIX)/lib/armory/ui
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
+	cp BitTornado/*.py $(DESTDIR)/lib/armory/BitTornado
+	cp BitTornado/BT1/*.py $(DESTDIR)/lib/armory/BitTornado/BT1
 	sed "s:python /usr:python $(PREFIX):g" < dpkgfiles/armory.desktop > $(DESTDIR)$(PREFIX)/share/applications/armory.desktop
 	sed "s:python /usr:python $(PREFIX):g" < dpkgfiles/armoryoffline.desktop > $(DESTDIR)$(PREFIX)/share/applications/armoryoffline.desktop
 	sed "s:python /usr:python $(PREFIX):g" < dpkgfiles/armorytestnet.desktop > $(DESTDIR)$(PREFIX)/share/applications/armorytestnet.desktop

armoryengine/ArmoryUtils.py

@@ -585,6 +585,7 @@ def killProcessTree(pid):
    # In this case, Windows is easier because we know it has the get_children
    # call, because have bundled a recent version of psutil.  Linux, however,
    # does not have that function call in earlier versions.
+   from subprocess import Popen, PIPE
    if not OS_LINUX:
       for child in psutil.Process(pid).get_children():
          killProcess(child.pid)