From 74310e73f2295a98e1cb7bd99c8dfcc70429124c Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 14:14:15 -0400 Subject: [PATCH] Update main.yml --- roles/calibre/tasks/main.yml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 8b5c97b2a..f2adfef0d 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -14,26 +14,9 @@ - calibre-bin when: internet_available and not is_rpi and (not calib_executable.stat.exists) -- name: Download pinned Calibre {{ calibre_deb_version }} (RPi) - get_url: - url: "{{ calibre_deb_url }}/{{ item }}.deb" - dest: "{{ downloads_dir }}/{{ item }}.deb" - mode: 0755 - force: no - backup: no - timeout: "{{ download_timeout }}" - with_items: - - calibre{{ calibre_deb_version }}_all - - calibre-bin{{ calibre_deb_version }}_armhf - when: internet_available and is_rpi - -- name: Install Calibre .debs on RPi +- name: Install Calibre .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) include_tasks: debs.yml - when: calibre_via_debs and is_rpi - -- name: Install Calibre experimental .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) - include_tasks: debs.yml - when: calibre_via_debs and not is_rpi and (not calib_executable.stat.exists) + when: calibre_via_debs and (not calib_executable.stat.exists) - name: Install Calibre via calibre-installer.py IF calibre_via_python (AND /usr/bin/calibre WAS MISSING) include_tasks: py-installer.yml