Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RFC iiab with --upgrade option and other enhancements for review #135

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
d4ed2cf
move repo creation
jvonau Aug 21, 2019
9641f6a
cp in place of wget, timeout for automation, make editing opt-in
jvonau Aug 21, 2019
d4dae2f
introduce --reinstall to iiab
jvonau Aug 21, 2019
291dbe4
timeout for automation2
jvonau Aug 21, 2019
d717b81
timeout for automation3
jvonau Aug 21, 2019
e335b1c
port post-install
jvonau Aug 24, 2019
9be7fa0
update flags/readme
jvonau Aug 24, 2019
fddc0ac
always update master branch
jvonau Aug 25, 2019
1c5b0a1
always update master branch 2
jvonau Aug 25, 2019
0104d8f
revert this when mainlined
jvonau Aug 25, 2019
4907d50
revert this when mainlined in iiab
jvonau Aug 25, 2019
a22ec10
force iiab symlink creation
jvonau Aug 25, 2019
bc2612f
exit if complete & kalite zip feedback
jvonau Aug 25, 2019
7e9a86d
extend timeout for password change and and enter hint
jvonau Aug 25, 2019
03d30da
--non-interactive
jvonau Aug 25, 2019
3c44c75
clone off of release branch and setup master
jvonau Oct 5, 2019
dd1e259
setup git upgrade path
jvonau Oct 6, 2019
3c477f2
use true for file that may not be present
jvonau Oct 6, 2019
df83182
refactor git branching
jvonau Oct 15, 2019
0918e07
disable some questions
jvonau Apr 8, 2020
0329994
--upgrade will do reinstall
jvonau Apr 8, 2020
353d278
https://github.com/iiab/iiab-factory/pull/133
jvonau Sep 1, 2020
4fdfe02
Paths
jvonau Sep 1, 2020
ef7c014
more $INTERACTIVE
jvonau Sep 1, 2020
6ab4775
use master & branch - sugggest iiab --upgrade
jvonau Sep 1, 2020
e5e1dd9
use master & branch - suggest iiab --upgrade
jvonau Sep 1, 2020
eb9efdf
RELEASE, update_self, softcode SCRIPT, ordering
jvonau Sep 1, 2020
ee51f00
softcode BRANCH
jvonau Sep 1, 2020
f27c7cc
misc
jvonau Sep 1, 2020
6b07a90
iiab-upgrade
jvonau Sep 1, 2020
a481ca1
Merge branch 'iiab-upgrade' into jv-pi-gen
jvonau Sep 1, 2020
dc47499
merge
jvonau Sep 1, 2020
10dead9
install iiab-upgrade
jvonau Sep 1, 2020
9b48d91
self-install from git repo
jvonau Sep 1, 2020
c6f569d
upgrade_roles
jvonau Sep 2, 2020
66a1a59
iiab_revision
jvonau Sep 2, 2020
4a6f1c7
fall though to iiab-install on first pass
jvonau Sep 2, 2020
45b8af1
skipping re-exec
jvonau Sep 2, 2020
135a480
grouping - move kernel test to the end
jvonau Sep 3, 2020
c9a7a29
whiptail for check_branch dialog
jvonau Sep 3, 2020
0ed069f
7.2-install.txt
jvonau Sep 4, 2020
afccf2c
update_self format
jvonau Sep 4, 2020
09c49fd
whiptail for passwords
jvonau Sep 4, 2020
7d32e6c
ansible
jvonau Sep 4, 2020
b24f0f4
merge iiab-upgrade
jvonau Sep 4, 2020
e735e1c
sync iiab to iiab-upgrade
jvonau Sep 4, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 100 additions & 0 deletions 7.2-install.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
#!/bin/bash
# Copied from: https://github.com/iiab/iiab-factory/blob/master/install.txt

# To install Internet-in-a-Box (IIAB) 7.2 / pre-release onto Raspberry Pi OS,
# Ubuntu 20.04 or Debian 10, run this 1-line installer:
#
# curl d.iiab.io/install.txt | sudo bash

# 1. WARNING: NOOBS IS *NOT* SUPPORTED, as its partitioning is very different.
# On a Raspberry Pi, WE RECOMMEND YOU INSTALL THE LATEST RASPBERRY PI OS:
# https://www.raspberrypi.org/documentation/installation/installing-images/README.md
# To attempt IIAB 7.2 on another Linux see the full/manual instructions:
# https://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-scratch

# 2. An Ethernet cable is HIGHLY RECOMMENDED during installation, as this is
# more reliable than Wi-Fi (and faster!)

# 3. Run 'sudo raspi-config' on RPi, to set LOCALISATION OPTIONS

# 4. OPTIONAL: if you have slow/pricey Internet, pre-position KA Lite's
# mandatory 0.9 GB English Pack (en.zip) within /tmp -- you can grab a copy
# from http://pantry.learningequality.org/downloads/ka-lite/0.17/content/contentpacks/en.zip

# 5. WHEN YOU RUN 1-LINE INSTALLER 'curl d.iiab.io/install.txt | sudo bash'
# YOU THEN NEED TO TYPE IN YOUR PASSWORD IF ON UBUNTU/DEBIAN/ETC (for sudo)
# ^^^ ^^^^ ^^^^ ^^ ^^^^ ^^ ^^^^ ^^^^^^^^

# 6. Follow on-screen instructions (TYPE 'sudo iiab' TO RESUME IF EVER NECESS!)

# 7. About 1-2 hours later, it will announce that INTERNET-IN-A-BOX (IIAB)
# SOFTWARE INSTALL IS COMPLETE, prompting you to reboot...TO ADD CONTENT!

# Thanks For Building Your Own Library To Serve One & All
#
# DRAFT IIAB 7.2 Release Notes:
# https://github.com/iiab/iiab/wiki/IIAB-7.2-Release-Notes
#
# Write to bugs @ iiab.io if you find issues, Thank You! Special Thanks to the
# countries+communities+volunteers who worked non-stop to bring about IIAB 7.2!
#
# IIAB Development Team
# http://FAQ.IIAB.IO

# Copied from: https://github.com/jvonau/iiab-factory/blob/jv-pi-gen/install.txt
set -e # Exit on error (avoids snowballing)
export DEBIAN_FRONTEND=noninteractive # Bypass (most!) interactive questions
BASE=/opt/iiab
BRANCH=release-7.2
ADMBRANCH=master
echo -e "\n\nDOWNLOAD (CLONE) IIAB'S 3 KEY REPOS INTO $BASE ...\n"
/usr/bin/apt -y install git nano whiptail
mkdir -p $BASE
cd $BASE
echo
if [ -d iiab-factory ]; then
echo -e "REPO iiab-factory EXISTS? -- updating master branch"
cd iiab-factory
git checkout master
git pull
git branch -D $BRANCH &> /dev/null || true
git checkout -b $BRANCH
cp $BASE/iiab-factory/iiab /usr/sbin/iiab
else
echo -e "Cloning iiab-factory"
git clone https://github.com/iiab/iiab-factory --depth 1
cd iiab-factory
git checkout -b $BRANCH
cp $BASE/iiab-factory/iiab /usr/sbin/iiab
fi
cd $BASE
echo
if [ -d iiab ]; then
echo -e "REPO iiab EXISTS? Consider 'sudo iiab --upgrade'" #FIXME
else
cd iiab
git clone https://github.com/iiab/iiab --depth 10 --branch master
git checkout -b $BRANCH # this goes
# post branching below
# git clone https://github.com/iiab/iiab --depth 10 --branch $BRANCH
# git checkout -b master
# git config branch.master.remote origin
# git config branch.master.merge refs/heads/master
# git checkout $BRANCH
fi
cd $BASE
echo
if [ -d iiab-admin-console ]; then
echo -e "REPO iiab-admin-console EXISTS? Consider 'sudo iiab --upgrade'" #FIXME
else
git clone https://github.com/iiab/iiab-admin-console --depth 1 --branch ADMBRANCH
git checkout -b $BRANCH # this goes
# post branching below
# git checkout -b master
# git config branch.master.remote origin
# git config branch.master.merge refs/heads/master
# git checkout $BRANCH
fi

# Run install script!
/usr/sbin/iiab
5 changes: 5 additions & 0 deletions flags/readme
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
The stages of completion are tracked here iiab-install has a built-in tracker so nothing is needed there
iiab-admin-console-complete
kalite-zone-complete
kalite-en.zip-complete
iiab-complete
Loading