Update install endpoint for BG installer

Author: Gadgetoid

README.md

@@ -9,11 +9,11 @@
 
 Stable library from PyPi:
 
-* Just run `sudo pip install pimoroni-sgp30`
+* Just run `python3 -m pip install pimoroni-sgp30`
 
 Latest/development library from GitHub:
 
 * `git clone https://github.com/pimoroni/sgp30-python`
 * `cd sgp30-python`
-* `sudo ./install.sh`
+* `sudo ./install.sh --unstable`
 

install-bullseye.sh renamed to install-legacy.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+
 CONFIG=/boot/config.txt
 DATESTAMP=`date "+%Y-%m-%d-%H-%M-%S"`
 CONFIG_BACKUP=false
@@ -8,16 +9,14 @@ RESOURCES_TOP_DIR=$USER_HOME/Pimoroni
 WD=`pwd`
 USAGE="sudo ./install.sh (--unstable)"
 POSITIONAL_ARGS=()
+FORCE=false
 UNSTABLE=false
-PYTHON="/usr/bin/python3"
 CODENAME=`lsb_release -sc`
 
-distro_check() {
-	if [[ $CODENAME != "bullseye" ]]; then
-		printf "This installer is for Raspberry Pi OS: Bullseye only, current distro: $CODENAME\n"
-		exit 1
-	fi
-}
+if [[ $CODENAME == "bullseye" ]]; then
+	bash ./install.sh $@
+	exit $?
+fi
 
 user_check() {
 	if [ $(id -u) -ne 0 ]; then
@@ -27,7 +26,7 @@ user_check() {
 }
 
 confirm() {
-	if [ "$FORCE" == '-y' ]; then
+	if $FORCE; then
 		true
 	else
 		read -r -p "$1 [y/N] " response < /dev/tty
@@ -107,9 +106,8 @@ while [[ $# -gt 0 ]]; do
 		UNSTABLE=true
 		shift
 		;;
-	-p|--python)
-		PYTHON=$2
-		shift
+	-f|--force)
+		FORCE=true
 		shift
 		;;
 	*)
@@ -123,21 +121,11 @@ while [[ $# -gt 0 ]]; do
 	esac
 done
 
-distro_check
 user_check
 
-if [ ! -f "$PYTHON" ]; then
-	printf "Python path $PYTHON not found!\n"
-	exit 1
-fi
-
-PYTHON_VER=`$PYTHON --version`
-
-inform "Installing. Please wait..."
+apt_pkg_install python-configparser
 
-$PYTHON -m pip install --upgrade configparser
-
-CONFIG_VARS=`$PYTHON - <<EOF
+CONFIG_VARS=`python - <<EOF
 from configparser import ConfigParser
 c = ConfigParser()
 c.read('library/setup.cfg')
@@ -190,16 +178,30 @@ fi
 
 cd library
 
-printf "Installing for $PYTHON_VER...\n"
-apt_pkg_install "${PY3_DEPS[@]}"
+printf "Installing for Python 2..\n"
+apt_pkg_install "${PY2_DEPS[@]}"
 if $UNSTABLE; then
-	$PYTHON setup.py install > /dev/null
+	python setup.py install > /dev/null
 else
-	$PYTHON -m pip install --upgrade $LIBRARY_NAME
+	pip install --upgrade $LIBRARY_NAME
 fi
 if [ $? -eq 0 ]; then
 	success "Done!\n"
-	echo "$PYTHON -m pip uninstall $LIBRARY_NAME" >> $UNINSTALLER
+	echo "pip uninstall $LIBRARY_NAME" >> $UNINSTALLER
+fi
+
+if [ -f "/usr/bin/python3" ]; then
+	printf "Installing for Python 3..\n"
+	apt_pkg_install "${PY3_DEPS[@]}"
+	if $UNSTABLE; then
+		python3 setup.py install > /dev/null
+	else
+		pip3 install --upgrade $LIBRARY_NAME
+	fi
+	if [ $? -eq 0 ]; then
+		success "Done!\n"
+		echo "pip3 uninstall $LIBRARY_NAME" >> $UNINSTALLER
+	fi
 fi
 
 cd $WD

install.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 CONFIG=/boot/config.txt
 DATESTAMP=`date "+%Y-%m-%d-%H-%M-%S"`
 CONFIG_BACKUP=false
@@ -9,13 +8,10 @@ RESOURCES_TOP_DIR=$USER_HOME/Pimoroni
 WD=`pwd`
 USAGE="sudo ./install.sh (--unstable)"
 POSITIONAL_ARGS=()
+FORCE=false
 UNSTABLE=false
-CODENAME=`lsb_release -sc`
+PYTHON="/usr/bin/python3"
 
-if [[ $CODENAME == "bullseye" ]]; then
-	bash ./install-bullseye.sh
-	exit $?
-fi
 
 user_check() {
 	if [ $(id -u) -ne 0 ]; then
@@ -25,7 +21,7 @@ user_check() {
 }
 
 confirm() {
-	if [ "$FORCE" == '-y' ]; then
+	if $FORCE; then
 		true
 	else
 		read -r -p "$1 [y/N] " response < /dev/tty
@@ -105,6 +101,15 @@ while [[ $# -gt 0 ]]; do
 		UNSTABLE=true
 		shift
 		;;
+	-f|--force)
+		FORCE=true
+		shift
+		;;
+	-p|--python)
+		PYTHON=$2
+		shift
+		shift
+		;;
 	*)
 		if [[ $1 == -* ]]; then
 			printf "Unrecognised option: $1\n";
@@ -118,9 +123,18 @@ done
 
 user_check
 
-apt_pkg_install python-configparser
+if [ ! -f "$PYTHON" ]; then
+	printf "Python path $PYTHON not found!\n"
+	exit 1
+fi
 
-CONFIG_VARS=`python - <<EOF
+PYTHON_VER=`$PYTHON --version`
+
+inform "Installing. Please wait..."
+
+$PYTHON -m pip install --upgrade configparser
+
+CONFIG_VARS=`$PYTHON - <<EOF
 from configparser import ConfigParser
 c = ConfigParser()
 c.read('library/setup.cfg')
@@ -173,30 +187,16 @@ fi
 
 cd library
 
-printf "Installing for Python 2..\n"
-apt_pkg_install "${PY2_DEPS[@]}"
+printf "Installing for $PYTHON_VER...\n"
+apt_pkg_install "${PY3_DEPS[@]}"
 if $UNSTABLE; then
-	python setup.py install > /dev/null
+	$PYTHON setup.py install > /dev/null
 else
-	pip install --upgrade $LIBRARY_NAME
+	$PYTHON -m pip install --upgrade $LIBRARY_NAME
 fi
 if [ $? -eq 0 ]; then
 	success "Done!\n"
-	echo "pip uninstall $LIBRARY_NAME" >> $UNINSTALLER
-fi
-
-if [ -f "/usr/bin/python3" ]; then
-	printf "Installing for Python 3..\n"
-	apt_pkg_install "${PY3_DEPS[@]}"
-	if $UNSTABLE; then
-		python3 setup.py install > /dev/null
-	else
-		pip3 install --upgrade $LIBRARY_NAME
-	fi
-	if [ $? -eq 0 ]; then
-		success "Done!\n"
-		echo "pip3 uninstall $LIBRARY_NAME" >> $UNINSTALLER
-	fi
+	echo "$PYTHON -m pip uninstall $LIBRARY_NAME" >> $UNINSTALLER
 fi
 
 cd $WD

library/setup.cfg

@@ -45,3 +45,5 @@ py2deps =
 py3deps =
 configtxt =
 commands =
+	printf "Setting up i2c..\n"
+	raspi-config nonint do_i2c 0