From 8d38bec27924ea2964254006828cd82013c6f834 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 13:52:58 -0400 Subject: [PATCH 01/15] Update calibre-install-unstable.sh --- scripts/calibre-install-unstable.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/calibre-install-unstable.sh b/scripts/calibre-install-unstable.sh index ab510bc5d..5af6a3f4f 100755 --- a/scripts/calibre-install-unstable.sh +++ b/scripts/calibre-install-unstable.sh @@ -16,10 +16,11 @@ export DEBIAN_FRONTEND=noninteractive # Prepares to update to latest from unstable apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 -echo "deb http://deb.debian.org/debian unstable main" >> /etc/apt/sources.list.d/unstable.list +echo "deb http://deb.debian.org/debian unstable main" > /etc/apt/sources.list.d/unstable.list apt update apt -y install calibre calibre-bin -# Removes last line, safer than: rm /etc/apt/sources.list.d/unstable.list -sed -i '$ d' /etc/apt/sources.list.d/unstable.list +## Removes last line, safer than: rm /etc/apt/sources.list.d/unstable.list +#sed -i '$ d' /etc/apt/sources.list.d/unstable.list +rm /etc/apt/sources.list.d/unstable.list # Clears the cache of testing and unstable apt update From 8e870811b73291f87b6667f71cfa372d4113b33c Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 13:55:12 -0400 Subject: [PATCH 02/15] Update calibre-install-packages.sh --- scripts/calibre-install-packages.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/calibre-install-packages.sh b/scripts/calibre-install-packages.sh index ba99b882a..55cbb96c2 100755 --- a/scripts/calibre-install-packages.sh +++ b/scripts/calibre-install-packages.sh @@ -48,7 +48,8 @@ apt update # Packages below cribbed from Calibre 3.23 installation on 2018-05-22, as recorded in /var/log/apt/history.log* apt -y install libegl1 libegl-mesa0 libqt5sensors5 libbrotli1 libwoff1 libpodofo0.9.5 libjs-coffeescript python-regex libhyphen0 libqt5webchannel5 python-msgpack python-html5-parser libqt5positioning5 libpcre2-16-0 libglvnd0 libdrm-common python-sip libqt5svg5 libnih-dbus1 qt5-gtk-platformtheme libc6-dbg libqt5help5 libc6-dev libqt5dbus5 libqt5sql5-sqlite libc6 libqt5widgets5 locales libegl1-mesa python-pyqt5.qtsvg python-lxml fontconfig-config libqt5xml5 libgbm1 libqt5printsupport5 libqt5qml5 libc-l10n libqt5gui5 libc-bin libnih1 libqt5webkit5 python-pyqt5.qtwebkit libdrm2 libqt5core5a libfontconfig1 libqt5opengl5 libc-dev-bin python-pyqt5 libqt5network5 libqt5designer5 libqt5quick5 libqt5sql5 # BUT DO NOT DO "apt -y install calibre calibre-bin" UNTIL calibre-install-latest.sh -# Removes last line, safer than: rm /etc/apt/sources.list.d/rpi-testing.list -sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list +## Removes last line, safer than: rm /etc/apt/sources.list.d/rpi-testing.list +#sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list +rm /etc/apt/sources.list.d/rpi-testing.list # Clears the cache of testing apt update From 1ad4505cb5bb547530bfe210bcebbde567a5e178 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 13:55:40 -0400 Subject: [PATCH 03/15] Update calibre-install-latest.sh --- scripts/calibre-install-latest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index 363866335..a80a1ffaa 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -20,7 +20,7 @@ export DEBIAN_FRONTEND=noninteractive apt -y install dirmngr # Prepares to update to latest from debian testing apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 -echo "deb http://deb.debian.org/debian testing main" >> /etc/apt/sources.list.d/debian-testing.list +echo "deb http://deb.debian.org/debian testing main" > /etc/apt/sources.list.d/debian-testing.list apt update apt -y install libqt5core5a python-lxml calibre calibre-bin ## Removes last line, safer than: rm /etc/apt/sources.list.d/debian-testing.list From ab3e06bae8d40bc947b32e261710e1612eaa61ab Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 13:57:37 -0400 Subject: [PATCH 04/15] Update calibre-install-latest.sh --- scripts/calibre-install-latest.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index a80a1ffaa..e8474366a 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -22,9 +22,10 @@ apt -y install dirmngr apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 echo "deb http://deb.debian.org/debian testing main" > /etc/apt/sources.list.d/debian-testing.list apt update -apt -y install libqt5core5a python-lxml calibre calibre-bin +#apt -y install libqt5core5a python-lxml calibre calibre-bin +apt -y install calibre calibre-bin ## Removes last line, safer than: rm /etc/apt/sources.list.d/debian-testing.list #sed -i '$ d' /etc/apt/sources.list.d/debian-testing.list rm /etc/apt/sources.list.d/debian-testing.list -# Clears the cache of testing +# Clears the cache of debian/testing apt update From 149cd1765ad7c3ec4ec96e241fdfb1839159f5e2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 13:58:01 -0400 Subject: [PATCH 05/15] Update calibre-install-packages.sh --- scripts/calibre-install-packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/calibre-install-packages.sh b/scripts/calibre-install-packages.sh index 55cbb96c2..7e64f95f3 100755 --- a/scripts/calibre-install-packages.sh +++ b/scripts/calibre-install-packages.sh @@ -51,5 +51,5 @@ apt -y install libegl1 libegl-mesa0 libqt5sensors5 libbrotli1 libwoff1 libpodofo ## Removes last line, safer than: rm /etc/apt/sources.list.d/rpi-testing.list #sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list rm /etc/apt/sources.list.d/rpi-testing.list -# Clears the cache of testing +# Clears the cache of rpi/testing apt update From b08d454e8c26814034bef7756fdb2f51e660d7d2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 13:59:06 -0400 Subject: [PATCH 06/15] Update calibre-install-unstable.sh --- scripts/calibre-install-unstable.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/calibre-install-unstable.sh b/scripts/calibre-install-unstable.sh index 5af6a3f4f..7d990ce23 100755 --- a/scripts/calibre-install-unstable.sh +++ b/scripts/calibre-install-unstable.sh @@ -16,11 +16,11 @@ export DEBIAN_FRONTEND=noninteractive # Prepares to update to latest from unstable apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 -echo "deb http://deb.debian.org/debian unstable main" > /etc/apt/sources.list.d/unstable.list +echo "deb http://deb.debian.org/debian unstable main" > /etc/apt/sources.list.d/debian-unstable.list apt update apt -y install calibre calibre-bin -## Removes last line, safer than: rm /etc/apt/sources.list.d/unstable.list -#sed -i '$ d' /etc/apt/sources.list.d/unstable.list -rm /etc/apt/sources.list.d/unstable.list -# Clears the cache of testing and unstable +## Removes last line, safer than: rm /etc/apt/sources.list.d/debian-unstable.list +#sed -i '$ d' /etc/apt/sources.list.d/debian-unstable.list +rm /etc/apt/sources.list.d/debian-unstable.list +# Clears the cache of debian/unstable apt update From 1af404d3ca85e22ee5337c6c915ddbe93a52ec0b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 14:00:09 -0400 Subject: [PATCH 07/15] Update calibre-install-latest-rpi-plus.sh --- scripts/calibre-install-latest-rpi-plus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/calibre-install-latest-rpi-plus.sh b/scripts/calibre-install-latest-rpi-plus.sh index 7237f2b2b..3164d9e35 100755 --- a/scripts/calibre-install-latest-rpi-plus.sh +++ b/scripts/calibre-install-latest-rpi-plus.sh @@ -29,5 +29,5 @@ echo "deb http://raspbian.raspberrypi.org/raspbian/ testing main" > /etc/apt/sou apt update apt -y install calibre calibre-bin rm /etc/apt/sources.list.d/rpi-testing.list -# Clears the cache of testing +# Clears the cache of rpi/testing apt update From 8c37c9ec2283e21d28ccabdb0e6f1d003456e4fd Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 14:00:24 -0400 Subject: [PATCH 08/15] Update calibre-install-latest-rpi.sh --- scripts/calibre-install-latest-rpi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/calibre-install-latest-rpi.sh b/scripts/calibre-install-latest-rpi.sh index 607592bbb..e0d5c22a2 100755 --- a/scripts/calibre-install-latest-rpi.sh +++ b/scripts/calibre-install-latest-rpi.sh @@ -14,5 +14,5 @@ apt -y install calibre calibre-bin ## Removes last line, safer than: rm /etc/apt/sources.list.d/rpi-testing.list #sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list rm /etc/apt/sources.list.d/rpi-testing.list -# Clears the cache of testing +# Clears the cache of rpi/testing apt update From 5521aef7d21a26dc649b9664b84b672cc39aaa72 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 14:02:53 -0400 Subject: [PATCH 09/15] Update calibre-install-latest-rpi.sh --- scripts/calibre-install-latest-rpi.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/calibre-install-latest-rpi.sh b/scripts/calibre-install-latest-rpi.sh index e0d5c22a2..32ab0588a 100755 --- a/scripts/calibre-install-latest-rpi.sh +++ b/scripts/calibre-install-latest-rpi.sh @@ -11,8 +11,7 @@ export DEBIAN_FRONTEND=noninteractive echo "deb http://raspbian.raspberrypi.org/raspbian/ testing main" > /etc/apt/sources.list.d/rpi-testing.list apt update apt -y install calibre calibre-bin -## Removes last line, safer than: rm /etc/apt/sources.list.d/rpi-testing.list -#sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list +#sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list # Removes last line rm /etc/apt/sources.list.d/rpi-testing.list # Clears the cache of rpi/testing apt update From bb0285f9cbd14f4104d5e36c02867214bebc2b76 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 14:03:34 -0400 Subject: [PATCH 10/15] Update calibre-install-latest.sh --- scripts/calibre-install-latest.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index e8474366a..b440bab7f 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -24,8 +24,7 @@ echo "deb http://deb.debian.org/debian testing main" > /etc/apt/sources.list.d/d apt update #apt -y install libqt5core5a python-lxml calibre calibre-bin apt -y install calibre calibre-bin -## Removes last line, safer than: rm /etc/apt/sources.list.d/debian-testing.list -#sed -i '$ d' /etc/apt/sources.list.d/debian-testing.list +#sed -i '$ d' /etc/apt/sources.list.d/debian-testing.list # Removes last line rm /etc/apt/sources.list.d/debian-testing.list # Clears the cache of debian/testing apt update From d33c22112c9906bd1b3129ac63a4fe629723bba3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 14:05:23 -0400 Subject: [PATCH 11/15] Update calibre-install-packages.sh --- scripts/calibre-install-packages.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/calibre-install-packages.sh b/scripts/calibre-install-packages.sh index 7e64f95f3..811345435 100755 --- a/scripts/calibre-install-packages.sh +++ b/scripts/calibre-install-packages.sh @@ -47,9 +47,8 @@ echo "deb http://raspbian.raspberrypi.org/raspbian/ testing main" > /etc/apt/sou apt update # Packages below cribbed from Calibre 3.23 installation on 2018-05-22, as recorded in /var/log/apt/history.log* apt -y install libegl1 libegl-mesa0 libqt5sensors5 libbrotli1 libwoff1 libpodofo0.9.5 libjs-coffeescript python-regex libhyphen0 libqt5webchannel5 python-msgpack python-html5-parser libqt5positioning5 libpcre2-16-0 libglvnd0 libdrm-common python-sip libqt5svg5 libnih-dbus1 qt5-gtk-platformtheme libc6-dbg libqt5help5 libc6-dev libqt5dbus5 libqt5sql5-sqlite libc6 libqt5widgets5 locales libegl1-mesa python-pyqt5.qtsvg python-lxml fontconfig-config libqt5xml5 libgbm1 libqt5printsupport5 libqt5qml5 libc-l10n libqt5gui5 libc-bin libnih1 libqt5webkit5 python-pyqt5.qtwebkit libdrm2 libqt5core5a libfontconfig1 libqt5opengl5 libc-dev-bin python-pyqt5 libqt5network5 libqt5designer5 libqt5quick5 libqt5sql5 -# BUT DO NOT DO "apt -y install calibre calibre-bin" UNTIL calibre-install-latest.sh -## Removes last line, safer than: rm /etc/apt/sources.list.d/rpi-testing.list -#sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list +# BUT DO NOT DO "apt -y install calibre calibre-bin" UNTIL calibre-install-latest.sh ? +#sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list # Removes last line rm /etc/apt/sources.list.d/rpi-testing.list # Clears the cache of rpi/testing apt update From 048a29f2c20d6a85005571ad02526c371b984d30 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 14:05:47 -0400 Subject: [PATCH 12/15] Update calibre-install-unstable.sh --- scripts/calibre-install-unstable.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/calibre-install-unstable.sh b/scripts/calibre-install-unstable.sh index 7d990ce23..ea10f6563 100755 --- a/scripts/calibre-install-unstable.sh +++ b/scripts/calibre-install-unstable.sh @@ -19,8 +19,7 @@ apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 echo "deb http://deb.debian.org/debian unstable main" > /etc/apt/sources.list.d/debian-unstable.list apt update apt -y install calibre calibre-bin -## Removes last line, safer than: rm /etc/apt/sources.list.d/debian-unstable.list -#sed -i '$ d' /etc/apt/sources.list.d/debian-unstable.list +#sed -i '$ d' /etc/apt/sources.list.d/debian-unstable.list # Removes last line rm /etc/apt/sources.list.d/debian-unstable.list # Clears the cache of debian/unstable apt update From 32735b2df17edf843c2f84285595fdeedb0b2b7a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 15:12:38 -0400 Subject: [PATCH 13/15] Update ansible --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index d1eaa70f5..f2d43e0d3 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -9,7 +9,7 @@ echo -e 'COMPLETE INSTALL INSTRUCTIONS:\nhttps://github.com/iiab/iiab/wiki/IIAB- echo -e 'NOW ATTEMPTING TO INSTALL THE LATEST ANSIBLE:' echo -e 'Ensure you'"'"'re online before running this (/opt/iiab/iiab/scripts/ansible)\n' -echo -e 'ALTERNATIVES: Run scripts/ansible-2.5.x-deprecated or scripts/ansible-2.6.x\n\n' +echo -e 'ALTERNATIVES: Run scripts/ansible-2.6.x or scripts/ansible-2.5.x-deprecated\n\n' GOOD_VER="2.6.3" # Ansible version for OLPC XO laptops (pip install). From 1f76b559fa513136d8aafba7e8cb9b7d1abf5579 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 15:13:40 -0400 Subject: [PATCH 14/15] Update ansible-2.6.x --- scripts/ansible-2.6.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index dd3f99125..93d7c7e95 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -9,7 +9,7 @@ echo -e 'COMPLETE INSTALL INSTRUCTIONS:\nhttps://github.com/iiab/iiab/wiki/IIAB- echo -e 'NOW ATTEMPTING TO INSTALL THE LATEST ANSIBLE 2.6.x:' echo -e 'Ensure you'"'"'re online before running this (/opt/iiab/iiab/scripts/ansible-2.6.x)\n' -echo -e 'ALTERNATIVES: Run scripts/ansible-2.5.x-deprecated "slow food", or scripts/ansible for the latest.\n\n' +echo -e 'ALTERNATIVES: Run scripts/ansible for the latest, or scripts/ansible-2.5.x-deprecated "slow food".\n\n' GOOD_VER="2.6.3" # Ansible version for OLPC XO laptops (pip install). From c8847a904c75e53670de1629a60608d2f3f6042f Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 15:18:04 -0400 Subject: [PATCH 15/15] Update ansible-2.6.x --- scripts/ansible-2.6.x | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index 93d7c7e95..f7dce85a3 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -9,11 +9,11 @@ echo -e 'COMPLETE INSTALL INSTRUCTIONS:\nhttps://github.com/iiab/iiab/wiki/IIAB- echo -e 'NOW ATTEMPTING TO INSTALL THE LATEST ANSIBLE 2.6.x:' echo -e 'Ensure you'"'"'re online before running this (/opt/iiab/iiab/scripts/ansible-2.6.x)\n' -echo -e 'ALTERNATIVES: Run scripts/ansible for the latest, or scripts/ansible-2.5.x-deprecated "slow food".\n\n' +echo -e 'ALTERNATIVES: Run scripts/ansible for the latest, or scripts/ansible-2.5.x-deprecated "slow food"\n\n' GOOD_VER="2.6.3" # Ansible version for OLPC XO laptops (pip install). - # On other OS's we attempt to install/upgrade/pin to the latest 2.6.x from PPA, which might provide an even more recent version of Ansible. + # On other OS's we attempt to install/upgrade/pin to the latest 2.6.x from PPA, which might provide an even more recent 2.6.x CURR_VER="undefined" # below are unused for future use # URL="NA"