From 32e9021fdc4add5d44c7f89ded6ddef4b75b8874 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 25 Feb 2021 08:48:44 -0500 Subject: [PATCH 1/7] scripts/ansible: Minor readability tweaks --- scripts/ansible | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index 9000700f5..3813d7448 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -1,11 +1,11 @@ -#!/bin/bash -e +#!/bin/bash -e # Exit right away on error # PLZ SEE http://FAQ.IIAB.IO > "What is Ansible and what version should I use?" # https://github.com/iiab/iiab/tree/master/scripts/ansible.md -APT_PATH=/usr/bin # Avoids problematic /usr/local/bin/apt on Linux Mint -CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.10.6" # Orig for 'yum install [rpm]' & XO laptops (pip install) +APT_PATH=/usr/bin # Avoids problematic /usr/local/bin/apt on Linux Mint +CURR_VER=undefined # Ansible version you currently have installed +GOOD_VER=2.10.6 # Orig for 'yum install [rpm]' & XO laptops (pip install) # We install the latest 'ansible-base' from PPA, using an OS 'CODENAME' below: # https://launchpad.net/~ansible/+archive/ubuntu/ansible From c28900a7dbaa55884692779f5b5232328154fa97 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 25 Feb 2021 08:49:32 -0500 Subject: [PATCH 2/7] Spacing tweak --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 3813d7448..34cdb485e 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -1,4 +1,4 @@ -#!/bin/bash -e # Exit right away on error +#!/bin/bash -e # Exit right away on error # PLZ SEE http://FAQ.IIAB.IO > "What is Ansible and what version should I use?" # https://github.com/iiab/iiab/tree/master/scripts/ansible.md From 6022d372f0aa80981729ae4cbaf2b0b7f8a4a85a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 25 Feb 2021 09:10:17 -0500 Subject: [PATCH 3/7] scripts/ansible: "bash -e" is debatable (document it for now) --- scripts/ansible | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 34cdb485e..1c3cf8ba9 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -1,4 +1,7 @@ -#!/bin/bash -e # Exit right away on error +#!/bin/bash -e +# FWIW "-e" tries to exit right away on error: +# https://tldp.org/LDP/abs/html/options.html +# https://stackoverflow.com/questions/9952177/whats-the-meaning-of-the-parameter-e-for-bash-shell-command-line/9952249 # PLZ SEE http://FAQ.IIAB.IO > "What is Ansible and what version should I use?" # https://github.com/iiab/iiab/tree/master/scripts/ansible.md From 1565d096b48e68a45031855608438c923a730d76 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 25 Feb 2021 19:22:38 -0500 Subject: [PATCH 4/7] scripts/ansible doc tweak --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 1c3cf8ba9..2bdff1050 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -74,7 +74,7 @@ echo -e "(Internet-in-a-Box requests ansible-base $GOOD_VER or higher)\n" # Code above designed to work on all Linux distributions, to preserve options, # in support of any volunteer(s) wanting to port IIAB to a new Linux/distro. -if [ ! -f /etc/debian_version ]; then # e.g. Raspbian, Ubuntu, Mint & Debian +if [ ! -f /etc/debian_version ]; then # e.g. RaspiOS, Ubuntu, Mint & Debian echo -e "\nEXITING: /etc/debian_version FILE NOT FOUND. Linux OS support info here:" echo -e " https://github.com/iiab/iiab/wiki/IIAB-Platforms\n" exit 1 From 3c7265ec506abf0963be6188614f6de51c9f0329 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Fri, 26 Feb 2021 09:42:50 -0500 Subject: [PATCH 5/7] nathansalapat is offline --- vars/raspbian-10.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vars/raspbian-10.yml b/vars/raspbian-10.yml index 3086c0a2c..ecd1494b8 100644 --- a/vars/raspbian-10.yml +++ b/vars/raspbian-10.yml @@ -32,5 +32,6 @@ minetest_server_bin: /library/games/minetest/bin/minetestserver minetest_working_dir: /library/games/minetest minetest_game_dir: /library/games/minetest/games/minetest_game minetest_rpi_src_tar: minetest.5.1.1.tar.gz -minetest_rpi_src_url: "http://www.nathansalapat.com/downloads/{{ minetest_rpi_src_tar }}" +#minetest_rpi_src_url: "http://www.nathansalapat.com/downloads/{{ minetest_rpi_src_tar }}" +minetest_rpi_src_url: "http://d.iiab.io/packages/{{ minetest_rpi_src_tar }}" minetest_rpi_src_untarred: Minetest From 67352afe9dac4868d10e132c408dee3ee887b997 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 26 Feb 2021 10:29:33 -0500 Subject: [PATCH 6/7] script/ansible: Link to Contributors Guide, summarizing IIAB's use of Ansible --- scripts/ansible | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ansible b/scripts/ansible index 2bdff1050..30dad1d7c 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -5,6 +5,7 @@ # PLZ SEE http://FAQ.IIAB.IO > "What is Ansible and what version should I use?" # https://github.com/iiab/iiab/tree/master/scripts/ansible.md +# https://github.com/iiab/iiab/wiki/IIAB-Contributors-Guide#ansible APT_PATH=/usr/bin # Avoids problematic /usr/local/bin/apt on Linux Mint CURR_VER=undefined # Ansible version you currently have installed From 804ea8e95f4e79c93252dee2722ccd5aa9857002 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 26 Feb 2021 10:50:35 -0500 Subject: [PATCH 7/7] scripts/ansible: Mention pip3 in addition to pip --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 30dad1d7c..c0eacea3b 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -57,7 +57,7 @@ echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible (TO INSTALL ANSIBLE echo -e "RECOMMENDED PREREQUISITES:" echo -e "(1) Verify you're online" echo -e "(2) Remove all prior versions of Ansible using..." -echo -e " 'apt purge ansible-base' and/or 'pip uninstall ansible-base' and/or" +echo -e " 'apt purge ansible-base' and/or 'pip3 uninstall ansible-base' and/or" echo -e " 'apt purge ansible' and/or 'pip uninstall ansible'" echo -e "(3) Remove all lines containing 'ansible' from..." echo -e " /etc/apt/sources.list and /etc/apt/sources.list.d/*\n"