Only install devtools if package with version is installed

cropsinsilico · Sep 15, 2023 · 427470a · 427470a
1 parent 212ea35
commit 427470a
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/yggdrasil/languages/R/install.py b/yggdrasil/languages/R/install.py
@@ -175,9 +175,10 @@ def install_packages(package_list, update=False, repos=None, **kwargs):
             args = ('repos=\"%s\"' % repos
                     + ("," if x.get('args', '') else "")
                     + x.get('args', ''))
-            install_method = 'install.packages'
+            before_install = ''
+            install_method = []
             if 'ver' in x:
-                R_cmd += [
+                before_install = [
                     "if (!is.element(\"devtools\", installed.packages()[,1])) {",
                     f'  install.packages("devtools", repos="{repos}", '
                     f'dependencies=TRUE)',
@@ -198,12 +199,16 @@ def install_packages(package_list, update=False, repos=None, **kwargs):
                 R_cmd += [
                     f"if (is.element(\"{x['name']}\", installed.packages()[,1])) {{",
                     f"  remove.packages(\"{x['name']}\")",
-                    '}',
+                    '}']
+                R_cmd += before_install
+                R_cmd += [
                     f"{install_method}({name}, {args})"]
             else:
                 R_cmd += [
-                    f"if (!is.element(\"{x['name']}\", installed.packages()[,1])) {{",
-                    f"{install_method}({name}, {args})",
+                    f"if (!is.element(\"{x['name']}\", installed.packages()[,1])) {{"]
+                R_cmd += ['  ' + iline for iline in before_install]
+                R_cmd += [
+                    f"  {install_method}({name}, {args})",
                     '} else {',
                     f"  print(\"{x['name']} already installed.\")",
                     '}']