From 61aba8cca222e346e05fd8c2921f2f05f01cc533 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 10 May 2018 16:33:59 -0400
Subject: [PATCH] Update debs.yml

---
 roles/calibre/tasks/debs.yml | 37 +++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml
index ad9917fce..12f86f797 100644
--- a/roles/calibre/tasks/debs.yml
+++ b/roles/calibre/tasks/debs.yml
@@ -1,24 +1,31 @@
-- name: Start by installing OS's Calibre package
-  package:
-    name: "{{ item }}"
-    state: latest
-  with_items:
-    - calibre
-    - calibre-bin
-  when: internet_available
+# roles/calibre/tasks/main.yml requires calibre_via_debs (to be True) before calling this script.
 
-# April 5 2018 raspbian is now tracking the latest Calibre with a small delay.
-# Should you really want the latest just run the below script standalone, it is
-# strongly suggested that waiting for the lastest deb from Raspbian is the best.
+# MOVED UP TO roles/calibre/tasks/main.yml
+#- name: Start by installing OS's Calibre package
+#  package:
+#    name: "{{ item }}"
+#    state: latest
+#  with_items:
+#    - calibre
+#    - calibre-bin
+#  when: internet_available
 
-- name: Upgrade to testing Calibre - RPi
+# April/May 2018: Raspbian .deb's for the latest Calibre now appear
+# (http://raspbian.raspberrypi.org/raspbian/pool/main/c/calibre/)
+# within about 10 days of Calibre's quasi-monthly releases
+# (https://calibre-ebook.com/whats-new).
+
+# If you want the latest Calibre, run the appropriate below script standalone.
+# HOWEVER: it's strongly suggested you wait for apt (blessed by your OS!)
+
+- name: Upgrade to Calibre testing .deb's - target Raspbian (rpi)
   command: scripts/calibre-install-latest-rpi.sh
   when: is_rpi and internet_available
 
-- name: Upgrade to testing Calibre - non-RPi
+- name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18)
   command: scripts/calibre-install-latest.sh
   when: not is_rpi and not is_ubuntu_18 and internet_available
 
-- name: Upgrade to unstable Calibre -  all
+- name: Upgrade to Calibre unstable .deb's IF calibre_unstable_debs
   command: scripts/calibre-install-unstable.sh
-  when: calibre_unstable and internet_available
+  when: calibre_unstable_debs and internet_available