Install libraspberrypi-bin & mrcal packages (#7)

* Re-order install script

* Install mrcal packages

install_limelight.sh

@@ -5,16 +5,7 @@ chmod +x install.sh
 ./install.sh
 rm install.sh
 
-echo "Installing additional things"
-sudo apt-get update
-apt-get install -y pigpiod pigpio device-tree-compiler libraspberrypi-bin
-apt-get install -y network-manager
-apt-get install -y net-tools
-# libcamera-driver stuff
-apt-get install -y libegl1 libopengl0 libopencv-core406 libgl1-mesa-dri libcamera0.1 libgbm1 libatomic1
 
-# And keep rpi-bin installed
-apt-mark manual libraspberrypi-bin
 
 # edit boot partition
 install -m 644 limelight/config.txt /boot/
@@ -36,10 +27,20 @@ systemctl enable ssh
 systemctl enable pigpiod
 
 # Remove extra packages too
-
+echo "Purging extra things"
 apt-get purge -y python3 gdb gcc g++ linux-headers* libgcc*-dev libqt* wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-misc-nonfree firmware-realtek raspberrypi-net-mods device-tree-compiler
 apt-get autoremove -y
 
+echo "Installing additional things"
+sudo apt-get update
+apt-get install -y pigpiod pigpio device-tree-compiler libraspberrypi-bin
+apt-get install -y network-manager
+apt-get install -y net-tools
+# libcamera-driver stuff
+apt-get install -y libegl1 libopengl0 libopencv-core406 libgl1-mesa-dri libcamera0.1 libgbm1 libatomic1
+# mrcal stuff
+apt-get install -y libcholmod3 liblapack3 libsuitesparseconfig5
+
 rm -rf /var/lib/apt/lists/*
 apt-get clean
 

install_opi5.sh

@@ -20,21 +20,24 @@ sed -i 's/# AllowedCPUs=4-7/AllowedCPUs=4-7/g' install.sh
 ./install.sh
 rm install.sh
 
+
+# Remove extra packages 
+echo "Purging extra things"
+apt-get remove -y gdb gcc g++ linux-headers* libgcc*-dev
+apt-get autoremove -y
+
+
+echo "Installing additional things"
 sudo apt-get update
 apt-get install -y network-manager net-tools libatomic1
-apt-mark manual netplan.io
-apt-mark manual libatomic1
+# mrcal stuff
+apt-get install -y libcholmod3 liblapack3 libsuitesparseconfig5
 
 cat > /etc/netplan/00-default-nm-renderer.yaml <<EOF
 network:
   renderer: NetworkManager
 EOF
 
-# Remove extra packages 
-
-apt-get remove -y gdb gcc g++ linux-headers* libgcc*-dev
-apt-get autoremove -y
-
 rm -rf /var/lib/apt/lists/*
 apt-get clean
 

install_pi.sh

@@ -5,16 +5,6 @@ chmod +x install.sh
 ./install.sh
 rm install.sh
 
-echo "Installing additional things"
-sudo apt-get update
-apt-get install -y pigpiod pigpio device-tree-compiler libraspberrypi-bin
-apt-get install -y network-manager
-apt-get install -y net-tools
-# libcamera-driver stuff + libatomic1 for wpilib
-apt-get install -y libegl1 libopengl0 libopencv-core406 libgl1-mesa-dri libcamera0.1 libgbm1 libatomic1
-
-# And keep rpi-bin installed, ideally
-apt-mark manual libraspberrypi-bin
 
 # and edit boot partition
 install -m 644 config.txt /boot/
@@ -34,9 +24,21 @@ systemctl enable pigpiod
 
 # Remove extra packages too
 
+echo "Purging extra things"
 apt-get purge -y python3 gdb gcc g++ linux-headers* libgcc*-dev device-tree-compiler
 apt-get autoremove -y
 
+echo "Installing additional things"
+sudo apt-get update
+apt-get install -y pigpiod pigpio device-tree-compiler libraspberrypi-bin
+apt-get install -y network-manager
+apt-get install -y net-tools
+# libcamera-driver stuff + libatomic1 for wpilib
+apt-get install -y libegl1 libopengl0 libopencv-core406 libgl1-mesa-dri libcamera0.1 libgbm1 libatomic1
+# mrcal stuff
+apt-get install -y libcholmod3 liblapack3 libsuitesparseconfig5
+
+
 rm -rf /var/lib/apt/lists/*
 apt-get clean