Minor fixes

cli_bilby/resume.py

@@ -78,7 +78,7 @@ def convert_df_to_preresult(df, format, resume_file):
     result.posterior = df
     result.priors = dict()
     filename = bilby.core.result.result_file_name(outdir, label, format)
-    filename = filename.replace("result", "preresult")
+    filename = filename.replace("result.{}".format(format), "preresult.{}".format(format))
     result.save_to_file(filename=filename, extension=format)
 
 

setup.py

@@ -72,7 +72,7 @@ setup(name='bilby',
       packages=['bilby', 'bilby.core', 'bilby.core.sampler',
                 'bilby.gw', 'bilby.gw.detector', 'bilby.gw.sampler',
                 'bilby.hyper', 'cli_bilby'],
-      package_dir={'bilby': 'bilby'},
+      package_dir={'bilby': 'bilby', 'cli_bilby': 'cli_bilby'},
       package_data={'bilby.gw': ['prior_files/*'],
                     'bilby.gw.detector': ['noise_curves/*.txt', 'detectors/*'],
                     'bilby': [version_file]},