From 20a76bf665734e7f4791ac32873bce00bad5e76d Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 20 Nov 2017 02:14:08 -0500
Subject: [PATCH] installer.yml -> py-installer.yml

---
 roles/calibre/tasks/main.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml
index 2ed34c4f2..35d86a8ad 100644
--- a/roles/calibre/tasks/main.yml
+++ b/roles/calibre/tasks/main.yml
@@ -6,12 +6,13 @@
 # INSTALL THE LATEST CALIBRE (calibre-server etc) ON ALL OS'S - RUNS IF /usr/bin/calibre-uninstall DOES NOT ALEADY EXIST
 
 - name: Install Calibre via calibre-installer.py
-  include_tasks: installer.yml
-  when: not calibre_db.stat.exists and (is_redhat or is_ubuntu)
+  include_tasks: py-installer.yml
+  when: (not calibre_db.stat.exists) and (not is_rpi)
+  #when: not calibre_db.stat.exists and (is_redhat or is_ubuntu)
 
 - name: Install Calibre via .debs
   include_tasks: debs.yml
-  when: not calibre_db.stat.exists and is_debian
+  when: (not calibre_db.stat.exists) and is_rpi
 
 # CREATE CALIBRE DATABASE WITH A SAMPLE BOOK
 
@@ -78,4 +79,4 @@
     - option: port
       value: "{{ calibre_port }}"
     - option: enabled
-      value: "{{ calibre_enabled }}"
\ No newline at end of file
+      value: "{{ calibre_enabled }}"