Clean up RPi workspace

NEMSLinux · Feb 24, 2019 · ff3f6b9 · ff3f6b9
1 parent 929bcde
commit ff3f6b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/build/160-raspi-config b/build/160-raspi-config
diff --git a/build/160-rpi-raspi-config b/build/160-rpi-raspi-config
@@ -4,6 +4,13 @@ echo $0 > /var/www/html/userfiles/nems-build.cur
 platform=$(/usr/local/bin/nems-info platform)
 
 if [[ $platform < 10 ]]; then
+
+  # Try apt first
+  echo "Installing raspi-config... "
+  apt update
+  apt -y install raspi-config
+
+  # if failed, install from debpack
   if [ ! $(dpkg-query -W -f='${Status}' raspi-config 2>/dev/null | grep -c "ok installed") -eq 1 ]; then
     wget -O /tmp/raspi-config.deb http://archive.raspberrypi.org/debian/pool/main/r/raspi-config/raspi-config_20180406+1_all.deb
     apt -y install libnewt0.52

diff --git a/build/160-rpimonitor → build/160-rpi-rpimonitor b/build/160-rpimonitor → build/160-rpi-rpimonitor