From 384e6151d2fee5dc57005320210da9b7be1deb21 Mon Sep 17 00:00:00 2001
From: Steve Kelly <kd2cca@gmail.com>
Date: Fri, 1 Sep 2023 16:38:55 +0000
Subject: [PATCH 1/2] improve `apt install` on ubuntu

The raspi header packages are named differently on ubuntu than raspian,
leading to failure to install cmake, et. al.
which leads to confusing errors later in the build.
---
 install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 3fb3982..687f6cc 100755
--- a/install.sh
+++ b/install.sh
@@ -26,7 +26,9 @@ git submodule update
 ## --------------------------------------------------------------------
 printf "\n[  2  ] ${GREEN}Updating system and installing dependencies...${NC}\n"
 sudo apt-get update
-sudo apt-get -y install raspberrypi-kernel-headers module-assistant pkg-config libncurses5-dev cmake git libzmq3-dev
+sudo apt-get -y install raspberrypi-kernel-headers # raspbian
+sudo apt-get -y install linux-headers-raspi # ubuntu
+sudo apt-get -y install module-assistant pkg-config libncurses5-dev cmake git libzmq3-dev
 sudo apt-get -y install swig avahi-daemon libavahi-client-dev python3-distutils libpython3-dev
 
 # In ubuntu we need to grant access to gpiomem

From c7ff2610157fd00520a11fe2a39eb42a81d6a6fd Mon Sep 17 00:00:00 2001
From: Steve Kelly <kd2cca@gmail.com>
Date: Fri, 1 Sep 2023 16:40:34 +0000
Subject: [PATCH 2/2] remove `cat | grep` idiom, rather grep directly on the
 file

---
 install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index 687f6cc..1e14934 100755
--- a/install.sh
+++ b/install.sh
@@ -154,7 +154,7 @@ fi
 
 printf "\n[  6  ] ${GREEN}Environmental Settings...${NC}\n"
 printf "${GREEN}1. SPI configuration...  "
-DtparamSPI=`cat ${CONFIG_TXT_PATH} | grep "dtparam=spi" | xargs | cut -d\= -f1`
+DtparamSPI=`grep "dtparam=spi" "${CONFIG_TXT_PATH}" | xargs | cut -d\= -f1`
 if [ "$DtparamSPI" = "dtparam" ]; then
     printf "${RED}Warning${NC}\n"
     printf "${RED}RespberryPi configuration file at ${CONFIG_TXT_PATH} contains SPI configuration${NC}\n"
@@ -165,7 +165,7 @@ else
 fi
 
 printf "${GREEN}2. ARM I2C Configuration...  "
-DtparamSPI=`cat ${CONFIG_TXT_PATH} | grep "dtparam=i2c_arm" | xargs | cut -d\= -f1`
+DtparamSPI=`grep "dtparam=i2c_arm" "${CONFIG_TXT_PATH}" | xargs | cut -d\= -f1`
 if [ "$DtparamSPI" = "dtparam" ]; then
     printf "${RED}Warning${NC}\n"
     printf "${RED}RespberryPi configuration file at ${CONFIG_TXT_PATH} contains ARM-I2C configuration${NC}\n"
@@ -176,7 +176,7 @@ else
 fi
 
 printf "${GREEN}3. I2C-VC Configuration...  "
-DtparamSPI=`cat ${CONFIG_TXT_PATH} | grep "dtparam=i2c_vc" | xargs | cut -d\= -f1`
+DtparamSPI=`grep "dtparam=i2c_vc" "${CONFIG_TXT_PATH}" | xargs | cut -d\= -f1`
 if [ "$DtparamSPI" = "dtparam" ]; then
     printf "${CYAN}OK :)${NC}\n"
 else
@@ -188,7 +188,7 @@ fi
 
 
 printf "${GREEN}4. SPI1-3CS Configuration...  "
-DtparamSPI=`cat ${CONFIG_TXT_PATH} | grep "dtoverlay=spi1-3cs" | xargs | cut -d\= -f1`
+DtparamSPI=`grep "dtoverlay=spi1-3cs" "${CONFIG_TXT_PATH}" | xargs | cut -d\= -f1`
 if [ "$DtparamSPI" = "dtoverlay" ]; then
     printf "${CYAN}OK :)${NC}\n"
 else