1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

Merge pull request #886 from iiab/revert-856-calibre-fast-install

Revert "Avoiding OS's ancient version(s) of Calibre (blocks install on Ubuntu 16.04, slows others)"
This commit is contained in:
A Holt 2018-07-11 03:43:06 -04:00 committed by GitHub
commit af503a9a35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5,19 +5,14 @@
path: "/usr/bin/calibre"
register: calib_executable
# The 8 lines below were breaking IIAB installs on Ubuntu 16.04 as of early
# July 2018 (https://github.com/iiab/iiab/issues/883) and were tested as
# unecessary on Raspbian Lite on RPi 3 B+ (calibre_via-debs: True) and
# Ubuntu 18.04 (calibre_via_python: True). PR #856 is the fix for now.
#- name: Install Calibre via OS's package installer (IF /usr/bin/calibre MISSING)
# package:
# name: "{{ item }}"
# state: latest
# with_items:
# - calibre
# - calibre-bin
# when: internet_available and (not calib_executable.stat.exists)
- name: Install Calibre via OS's package installer (IF /usr/bin/calibre MISSING)
package:
name: "{{ item }}"
state: latest
with_items:
- calibre
- calibre-bin
when: internet_available and (not calib_executable.stat.exists)
- name: Install Calibre experimental .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING)
include_tasks: debs.yml