updated mosaik wrapper again

broadinstitute · Sep 28, 2015 · 176efe0 · 176efe0
1 parent 14eba25
commit 176efe0
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/tools/mosaik.py b/tools/mosaik.py
@@ -25,12 +25,11 @@ def __init__(self):
             else:
                 os.environ['BLD_PLATFORM'] = 'macosx'
         install_methods = []
-        destination_dir = os.path.join(util.file.get_build_path(), 'mosaik-{}'.format(commit_hash), 'MOSAIK-{}'.format(commit_hash))
-        print("destination_dir", destination_dir)
+        destination_dir = os.path.join(util.file.get_build_path(), 'mosaik-{}'.format(commit_hash))
         install_methods.append(
             DownloadAndBuildMosaik(url.format(commit_hash=commit_hash,
                                               os='source'),
-                                   os.path.join(destination_dir, 'bin', 'MosaikAligner'),
+                                   os.path.join(destination_dir, 'MOSAIK-{}'.format(commit_hash), 'bin', 'MosaikAligner'),
                                    destination_dir))
         tools.Tool.__init__(self, install_methods=install_methods)
 
@@ -39,8 +38,7 @@ def version(self):
 
     def get_networkFile(self):
         # this is the directory to return
-        dir = os.path.join(util.file.get_build_path(), 'mosaik-{}'.format(commit_hash),
-                           'MOSAIK-{}/src'.format(commit_hash), 'networkFile')
+        dir = os.path.join(util.file.get_build_path(), 'mosaik-{}'.format(commit_hash), 'MOSAIK-{}'.format(commit_hash) , 'src', 'networkFile')
         if not os.path.isdir(dir):
             # if it doesn't exist, run just the download-unpack portion of the
             #     source installer