external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #834 from holta/calibre-fixes-831

Browse source 
install Calibre via Debian .debs insteads of Raspbian .debs (fixes 831)
This commit is contained in:
A Holt 2018-06-10 02:02:46 -04:00 • committed by GitHub
commit 4da748c86d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
roles/calibre/tasks/debs.yml
View file

@ -19,7 +19,8 @@
# HOWEVER: it's strongly suggested you wait for apt (blessed by your OS!) # HOWEVER: it's strongly suggested you wait for apt (blessed by your OS!)
- name: Upgrade to Calibre testing .deb's - target Raspbian (rpi) - name: Upgrade to Calibre testing .deb's - target Raspbian (rpi)
command: scripts/calibre-install-latest-rpi.sh #command: scripts/calibre-install-latest-rpi.sh #fails with Calibre 3.24 & 3.25, and beyond?
command: scripts/calibre-install-latest.sh #Debian approach works for now (3.24 & 3.25)
when: is_rpi and internet_available when: is_rpi and internet_available
- name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) - name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18)

2
roles/elgg/defaults/main.yml
View file

@ -1,5 +1,5 @@
elgg_xx: elgg elgg_xx: elgg
elgg_version: "2.3.6" elgg_version: "2.3.7"
# elgg_mysql_password: defined in default_vars # elgg_mysql_password: defined in default_vars
elgg_url: /elgg elgg_url: /elgg

2
roles/phpmyadmin/defaults/main.yml
View file

@ -1,4 +1,4 @@
phpmyadmin_install: False phpmyadmin_install: False
phpmyadmin_enabled: False phpmyadmin_enabled: False
phpmyadmin_name: "phpMyAdmin-4.8.0.1-all-languages" phpmyadmin_name: "phpMyAdmin-4.8.1-all-languages"
phpmyadmin_name_zip: "{{ phpmyadmin_name }}.zip" phpmyadmin_name_zip: "{{ phpmyadmin_name }}.zip"

2
scripts/ansible
View file

@ -4,7 +4,7 @@ echo -e '\nATTEMPTING TO INSTALL THE LATEST (RELEASED VERSION OF) ANSIBLE.'
echo -e 'Ensure you'"'"'re online before running this script!' echo -e 'Ensure you'"'"'re online before running this script!'
echo -e 'OR: consider scripts/ansible-2.4.x or scripts/ansible/2.5.x "slow food" instead.\n' echo -e 'OR: consider scripts/ansible-2.4.x or scripts/ansible/2.5.x "slow food" instead.\n'
GOOD_VER="2.5.3" # Ansible version for OLPC XO laptops (pip install). GOOD_VER="2.5.4" # Ansible version for OLPC XO laptops (pip install).
# On other OS's we install/upgrade to THE latest (released version of) Ansible. # On other OS's we install/upgrade to THE latest (released version of) Ansible.
CURR_VER="undefined" CURR_VER="undefined"
# below are unused for future use # below are unused for future use

2
scripts/ansible-2.5.x
View file

@ -4,7 +4,7 @@ echo -e '\nATTEMPTING TO INSTALL THE LATEST ANSIBLE 2.5.x'
echo -e 'Ensure you'"'"'re online before running this script!' echo -e 'Ensure you'"'"'re online before running this script!'
echo -e 'OR: consider scripts/ansible to keep up-to-date with Ansible'"'"'s evolution.\n' echo -e 'OR: consider scripts/ansible to keep up-to-date with Ansible'"'"'s evolution.\n'
GOOD_VER="2.5.3" # Ansible version for OLPC XO laptops (pip install). GOOD_VER="2.5.4" # Ansible version for OLPC XO laptops (pip install).
# On other OS's we attempt to install/upgrade/pin to the latest Ansible 2.5.x # On other OS's we attempt to install/upgrade/pin to the latest Ansible 2.5.x
CURR_VER="undefined" CURR_VER="undefined"
# below are unused for future use # below are unused for future use

13
scripts/calibre-install-latest-rpi.sh
View file

@ -3,7 +3,18 @@
# Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical # Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical
# breakthrough possible! # breakthrough possible!
# #
# Calibre 3.23 is the latest available from testing as of 2018-05-10: # Worked up to Calibre 3.23 from May 2018.
# Calibre 3.24 and 3.25 fail to "apt install" in June 2018:
#
# The following packages have unmet dependencies:
# calibre : Depends: python-pyqt5 (>= 5.10.1+dfsg-2) but 5.10.1+dfsg-1+rpi1 is to be installed
# E: Unable to correct problems, you have held broken packages.
#
# Debian approach (calibre-install-latest.sh) is the workaround for now:
#
# https://github.com/iiab/iiab/pull/833
#
# Calibre 3.25 is the latest available from testing as of 2018-06-10:
# #
# http://raspbian.raspberrypi.org/raspbian/pool/main/c/calibre/ # http://raspbian.raspberrypi.org/raspbian/pool/main/c/calibre/
# http://archive.raspbian.org/raspbian/pool/main/c/calibre/ # http://archive.raspbian.org/raspbian/pool/main/c/calibre/

2
scripts/calibre-install-latest.sh
View file

@ -3,7 +3,7 @@
# Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical # Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical
# breakthrough possible! # breakthrough possible!
# #
# Calibre 3.23 is the latest available from testing as of 2018-05-10: # Calibre 3.25 is the latest available from testing as of 2018-06-10:
# #
# https://packages.debian.org/search?keywords=calibre # https://packages.debian.org/search?keywords=calibre
# http://deb.debian.org/debian/pool/main/c/calibre/ # http://deb.debian.org/debian/pool/main/c/calibre/

2
scripts/calibre-install-unstable.sh
View file

@ -3,7 +3,7 @@
# Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical # Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical
# breakthrough possible! # breakthrough possible!
# #
# Calibre 3.23 is the latest available from testing as of 2018-05-10: # Calibre 3.25 is the latest available from testing as of 2018-06-10:
# #
# https://packages.debian.org/search?keywords=calibre # https://packages.debian.org/search?keywords=calibre
# http://deb.debian.org/debian/pool/main/c/calibre/ # http://deb.debian.org/debian/pool/main/c/calibre/