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). diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index dd3f99125..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-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). - # 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" 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 diff --git a/scripts/calibre-install-latest-rpi.sh b/scripts/calibre-install-latest-rpi.sh index 607592bbb..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 testing +# Clears the cache of rpi/testing apt update diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index 363866335..b440bab7f 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -20,11 +20,11 @@ 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 -#sed -i '$ d' /etc/apt/sources.list.d/debian-testing.list +#apt -y install libqt5core5a python-lxml calibre calibre-bin +apt -y install calibre calibre-bin +#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 testing +# Clears the cache of debian/testing apt update diff --git a/scripts/calibre-install-packages.sh b/scripts/calibre-install-packages.sh index ba99b882a..811345435 100755 --- a/scripts/calibre-install-packages.sh +++ b/scripts/calibre-install-packages.sh @@ -47,8 +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 -# Clears the cache of testing +# 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 diff --git a/scripts/calibre-install-unstable.sh b/scripts/calibre-install-unstable.sh index ab510bc5d..ea10f6563 100755 --- a/scripts/calibre-install-unstable.sh +++ b/scripts/calibre-install-unstable.sh @@ -16,10 +16,10 @@ 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 -# Clears the cache of testing and unstable +#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