Merge branch 'update-modules-install' of github.com:ErikDanielsson/to…

…ols into update-modules-install
nf-core · Jun 23, 2021 · 4dce523 · 4dce523
2 parents 2586097 + e39ff09
commit 4dce523
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nf_core/__main__.py b/nf_core/__main__.py
@@ -381,8 +381,8 @@ def list(ctx, pipeline_dir, json):
 @click.argument("pipeline_dir", type=click.Path(exists=True), required=True, metavar="<pipeline directory>")
 @click.option("-t", "--tool", type=str, metavar="<tool> or <tool/subtool>")
 @click.option("-l", "--latest", is_flag=True, default=False, help="Install the latest version of the module")
-@click.option("--force", is_flag=True, default=False, help="Force installation of module if module already exists")
-@click.option("--sha", type=str, metavar="<commit sha>", help="Install module at commit SHA")
+@click.option("-f", "--force", is_flag=True, default=False, help="Force installation of module if module already exists")
+@click.option("-s", "--sha", type=str, metavar="<commit sha>", help="Install module at commit SHA")
 def install(ctx, pipeline_dir, tool, latest, force, sha):
     """
     Add a DSL2 software wrapper module to a pipeline.

diff --git a/nf_core/modules/pipeline_modules.py b/nf_core/modules/pipeline_modules.py
@@ -160,7 +160,7 @@ def install(self, module=None):
         if not self.check_module_files_installed(module, module_dir):
             return False
 
-        if self.sha is not None:
+        if self.sha:
             if not current_entry is None and not self.force:
                 return False
             if self.download_module_file(module, self.sha, install_folder, module_dir):