Cs fixes

Oefenweb · May 17, 2021 · 4d26565 · 4d26565
1 parent 96db9da
commit 4d26565
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/tasks/get_list_packages.yml b/tasks/get_list_packages.yml
diff --git a/tasks/packages.yml b/tasks/packages.yml
@@ -21,9 +21,22 @@
   tags:
     - r-packages-copy-r-scripts
 
-- name: packages | init the package lists
-  include: get_list_packages.yml
-  when: r_list_packages_once
+- block:
+
+    - name: packages | list installed packages
+      command: >
+        R-list-installed-packages {{ r_packages_lib }}
+      environment: "{{ r_environment }}"
+      register: _r_installed_packages
+      changed_when: false
+
+    - name: packages | set_fact list installed packages
+      set_fact:
+        r_installed_packages: "{{ _r_installed_packages.stdout_lines }}"
+
+  when: r_list_packages_once | bool
+  tags:
+    - r-packages-list-installed
 
 - name: packages | install
   command: >

diff --git a/templates/R-install-package.j2 b/templates/R-install-package.j2
@@ -16,7 +16,7 @@ if (type == 'github') {
   package = argv[1];
 }
 
-{% if r_list_packages_once == false %}
+{% if not r_list_packages_once %}
 if (!(package %in% installed.packages(lib.loc = lib)[, 'Package'])) {
 {% endif %}
   if (type == 'cran') {
@@ -54,6 +54,6 @@ if (!(package %in% installed.packages(lib.loc = lib)[, 'Package'])) {
     cat("Unrecognised type\n");
     q(status = 1);
   }
-{% if r_list_packages_once == false %}
+{% if not r_list_packages_once %}
 }
 {% endif %}
diff --git a/templates/R-list-installed-packages.j2 b/templates/R-list-installed-packages.j2
@@ -9,4 +9,3 @@ if (is.null(argv) | length(argv) < 1) {
 lib = ifelse(is.na(argv[1]), '{{ r_packages_lib }}', argv[1]);
 
 cat(paste(installed.packages(lib.loc = lib)[, 'Package'], collapse="\n"))
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,3 @@ if (is.null(argv) \| length(argv) < 1) {
		lib = ifelse(is.na(argv[1]), '{{ r_packages_lib }}', argv[1]);

		cat(paste(installed.packages(lib.loc = lib)[, 'Package'], collapse="\n"))