From b9350d12c071542bd59cb99f7bd1f656e466fd61 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Thu, 21 Jun 2018 19:42:51 +0000 Subject: [PATCH 01/21] fixes for rpi --- roles/sugarizer/tasks/main.yml | 1 + roles/sugarizer/templates/sugarizer.conf | 3 +- roles/sugarizer/templates/sugarizer.js | 40 ++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 roles/sugarizer/templates/sugarizer.js diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 0dbd4d965..84b4311d8 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -99,6 +99,7 @@ - { src: 'sugarizer.service.j2' , dest: '/etc/systemd/system/sugarizer.service', mode: '0644' } - { src: 'sugarizer.ini' , dest: '{{ sugarizer_location }}/{{ sugarizer_server_version }}/env/sugarizer.ini', mode: '0644' } - { src: 'sugarizer.conf' , dest: '/etc/apache2/sites-available',mode: '0644' } + - { src: 'sugarizer.js' , dest: '/opt/iiab/sugarizer-server',mode: '0644' } - name: Create the symlink enabling the rewrite file: src=/etc/apache2/sites-available/sugarizer.conf diff --git a/roles/sugarizer/templates/sugarizer.conf b/roles/sugarizer/templates/sugarizer.conf index ff1fe7508..e74fb0c9a 100644 --- a/roles/sugarizer/templates/sugarizer.conf +++ b/roles/sugarizer/templates/sugarizer.conf @@ -1,2 +1 @@ -RewriteEngine on -RewriteRule ^/sugarizer(.*)$ http://localhost:8089$1 [PT] +ProxyPass /sugarizer http://box.lan:8089 diff --git a/roles/sugarizer/templates/sugarizer.js b/roles/sugarizer/templates/sugarizer.js new file mode 100644 index 000000000..abd505ea6 --- /dev/null +++ b/roles/sugarizer/templates/sugarizer.js @@ -0,0 +1,40 @@ +// require files +var express = require('express'), + http = require('http'), + https = require('https'), + settings = require('./config/settings'), + common = require('./dashboard/helper/common'); + ini = settings.load(), + app = express(), + server = null; + +// init common +common.init(ini); + +//configure app setting +require('./config/main')(app, ini); + +// include api routes +require('./api/route')(app, ini); + +// include dashboard routes +require('./dashboard/route')(app, ini); + +// Handle https +if (ini.security.https) { + var credentials = common.loadCredentials(ini); + if (!credentials) { + console.log("Error reading HTTPS credentials"); + process.exit(-1); + } + server = https.createServer(credentials, app); +} else { + server = http.createServer(app); +} + +// Start listening +server.listen(ini.web.port,"0.0.0.0"); +console.log("Sugarizer Server is listening on"+(ini.security.https ? " secure":"")+" port " + ini.web.port + "..."); + +//export app for testing +module.exports = app; From 818b7189b494054e59390d511386fb65417ef0f4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 7 Aug 2018 18:10:52 -0400 Subject: [PATCH 02/21] Update sugarizer.conf --- roles/sugarizer/templates/sugarizer.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/sugarizer/templates/sugarizer.conf b/roles/sugarizer/templates/sugarizer.conf index e74fb0c9a..3144c7b8a 100644 --- a/roles/sugarizer/templates/sugarizer.conf +++ b/roles/sugarizer/templates/sugarizer.conf @@ -1 +1,6 @@ ProxyPass /sugarizer http://box.lan:8089 +#ProxyPass /sugarizer http://box:8089 + +# Old Version, wasn't working as of 2018-08-07: +#RewriteEngine on +#RewriteRule ^/sugarizer(.*)$ http://localhost:8089$1 [PT] From 3225f0c4b298f28ca9de5691932982f79026002c Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 8 Aug 2018 22:34:02 -0400 Subject: [PATCH 03/21] Update sugarizer.conf --- roles/sugarizer/templates/sugarizer.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/sugarizer/templates/sugarizer.conf b/roles/sugarizer/templates/sugarizer.conf index 3144c7b8a..1889a5efe 100644 --- a/roles/sugarizer/templates/sugarizer.conf +++ b/roles/sugarizer/templates/sugarizer.conf @@ -1,5 +1,6 @@ ProxyPass /sugarizer http://box.lan:8089 #ProxyPass /sugarizer http://box:8089 +#ProxyPass /sugarizer http://127.0.0.1:8089 # Old Version, wasn't working as of 2018-08-07: #RewriteEngine on From 26244932bd0c7ff48658da4b363fecd2c405be41 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 22 Aug 2018 13:22:25 -0400 Subject: [PATCH 04/21] Use the duplicate copy: roles/httpd/html/html/credits.html --- roles/httpd/files/html/credits.html | 49 ----------------------------- 1 file changed, 49 deletions(-) delete mode 100755 roles/httpd/files/html/credits.html diff --git a/roles/httpd/files/html/credits.html b/roles/httpd/files/html/credits.html deleted file mode 100755 index c1cef0e8b..000000000 --- a/roles/httpd/files/html/credits.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - -Credits - - - -

Internet-in-a-Box Credits

- - Internet-in-a-Box (formerly known as XSCE School Server) includes a variety of educational content and applications which are attributed as follows:

- - All Wikipedia content is available for free at www.wikipedia.org.
- All other Wikimedia content is available for free via links at www.wikimedia.org.
- All Khan Academy content is available for free at www.khanacademy.org.
- All CK-12 content is available for free at www.ck12.org.
- All PhET Interactive Simulations content is available for free at phet.colorado.edu.
- All MedLine content is available for free at medlineplus.gov.
- All Hesperian content is available for free at hesperian.org.
- Arabic translations of Hesperian content were done by Arab Resource Collective and are available for free at mawared.org.
- All Gutenberg content is available for free at www.gutenberg.org.
- All OLPC content is available for free at wiki.laptop.org.
- All MIT Scratch content is available for free at scratch.mit.edu.
- All UNESCO's IICBA content is available for free at www.iicba.unesco.org/.
- All Math Expression content is available for free at www.mathexpression.com.
- All Music Theory content is available for free at www.musictheory.net.
- All HealthPhone content is available for free at www.healthphone.org.
- All Centers for Disease Control content is available for free at www.cdc.gov.
- All Global Emergency Medicine Wiki content is available for free at wikem.org/wiki/Main_Page.

- - Internet-in-a-Box also includes the work of content aggregators which we gratefully acknowledge:

- - RACHEL is a curation of selected offline content at oer2go.org.
- Kiwix is a ZIM server and repository of Wikimedia and other content in a compressed ZIM file format at www.kiwix.org.
- KA Lite is a server and repository of Khan Academy content in various languages at learningequality.org/ka-lite.

- - Internet-in-a-Box also contains a number of applications each of which has its own attribution information, which is included.

- - This Internet-in-a-Box distribution resides at github.com/iiab.

- - It is licensed under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.

- - Licensing information may be found at github.com/iiab/iiab/blob/master/LICENSE.md.
- - - - From 1484e39d99cd7d4bb6b9851fae30cb2abdef3cbb Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 22 Aug 2018 13:24:32 -0400 Subject: [PATCH 05/21] Update credits.html --- roles/httpd/files/html/html/credits.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/httpd/files/html/html/credits.html b/roles/httpd/files/html/html/credits.html index c1cef0e8b..c6e0b9ce0 100755 --- a/roles/httpd/files/html/html/credits.html +++ b/roles/httpd/files/html/html/credits.html @@ -3,6 +3,10 @@ + + Credits From e13608492b9a4001ed3105ed58e6114bb9cf73cf Mon Sep 17 00:00:00 2001 From: George Hunt Date: Wed, 22 Aug 2018 23:39:17 +0000 Subject: [PATCH 06/21] seems to work --- roles/sugarizer/templates/sugarizer.conf | 9 ++------- roles/sugarizer/templates/sugarizer.js | 3 +++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/roles/sugarizer/templates/sugarizer.conf b/roles/sugarizer/templates/sugarizer.conf index 1889a5efe..6528ddf8c 100644 --- a/roles/sugarizer/templates/sugarizer.conf +++ b/roles/sugarizer/templates/sugarizer.conf @@ -1,7 +1,2 @@ -ProxyPass /sugarizer http://box.lan:8089 -#ProxyPass /sugarizer http://box:8089 -#ProxyPass /sugarizer http://127.0.0.1:8089 - -# Old Version, wasn't working as of 2018-08-07: -#RewriteEngine on -#RewriteRule ^/sugarizer(.*)$ http://localhost:8089$1 [PT] +ProxyPass /sugarizer http://box.lan:8089/sugarizer +ProxyPassReverse /sugarizer http://box.lan:8089/sugarizer diff --git a/roles/sugarizer/templates/sugarizer.js b/roles/sugarizer/templates/sugarizer.js index abd505ea6..1fe914071 100644 --- a/roles/sugarizer/templates/sugarizer.js +++ b/roles/sugarizer/templates/sugarizer.js @@ -32,6 +32,9 @@ if (ini.security.https) { server = http.createServer(app); } +var pathPrefix = '/sugarizer'; +app.use(pathPrefix, require('path-prefix-proxy')(pathPrefix)); + // Start listening server.listen(ini.web.port,"0.0.0.0"); console.log("Sugarizer Server is listening on"+(ini.security.https ? " secure":"")+" port " + ini.web.port + "..."); From 95977e1ca3f9e58d7328b7ca24aa8222a1c6d915 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Thu, 23 Aug 2018 00:31:02 +0000 Subject: [PATCH 07/21] confusion on dependencies --- roles/sugarizer/tasks/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index e4be6106a..60d0a89ec 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -160,6 +160,13 @@ # chdir: "{{ sugarizer_location }}/sugarizer/server" # when: internet_available and is_F18 and not node_modules_exists +# Add a nodejs express function that appends a prefix to urls +- name: Install path prefix proxy + command: npm install --allow-root --unsafe-perm=true path-prefix-proxy + args: + chdir: "{{ sugarizer_location }}/{{ sugarizer_server_version }}" + when: internet_available + # 5. PLACE CONFIG FILES - name: Configure sugarizer.service (systemd), sugarizer.conf (Apache) and sugarizer.ini From a5d61ec89785f30c1b2c6f6f07d1ba4ee04d67e4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 22 Aug 2018 22:46:10 -0400 Subject: [PATCH 08/21] Update sugarizer.conf --- roles/sugarizer/templates/sugarizer.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/sugarizer/templates/sugarizer.conf b/roles/sugarizer/templates/sugarizer.conf index 6528ddf8c..7f90d01ce 100644 --- a/roles/sugarizer/templates/sugarizer.conf +++ b/roles/sugarizer/templates/sugarizer.conf @@ -1,2 +1,2 @@ -ProxyPass /sugarizer http://box.lan:8089/sugarizer -ProxyPassReverse /sugarizer http://box.lan:8089/sugarizer +ProxyPass /sugarizer http://localhost:8089/sugarizer +ProxyPassReverse /sugarizer http://localhost:8089/sugarizer From 544d251661cd45336279e7dd80484830a03ff671 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 22 Aug 2018 23:04:04 -0400 Subject: [PATCH 09/21] Update main.yml --- roles/sugarizer/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 60d0a89ec..ff1ffe6c6 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -197,6 +197,12 @@ state: restarted daemon_reload: yes when: sugarizer_enabled + +- name: Restart Apache so http://box/sugarizer works (not just http://box:8089) + systemd: + name: apache2 + state: restarted + when: sugarizer_enabled - name: 'Disable+stop systemd service if sugarizer_enabled: False' systemd: From 8d38bec27924ea2964254006828cd82013c6f834 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Aug 2018 13:52:58 -0400 Subject: [PATCH 10/21] 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 11/21] 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 12/21] 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 13/21] 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 14/21] 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 15/21] 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 16/21] 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 17/21] 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 18/21] 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 19/21] 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 20/21] 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 21/21] 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