From 15f790ecf232480bb13657c53071f6b1969d89d0 Mon Sep 17 00:00:00 2001
From: okunze <okunze@users.noreply.github.com>
Date: Fri, 26 Aug 2022 12:20:56 +0000
Subject: [PATCH] Automated Change by GitHub Actions

---
 source/argon1.sh         | 25 +++++++++++++++++++------
 source/downloaded.txt    |  1 -
 source/downloaded_on.txt |  1 +
 3 files changed, 20 insertions(+), 7 deletions(-)
 delete mode 100644 source/downloaded.txt
 create mode 100644 source/downloaded_on.txt

diff --git a/source/argon1.sh b/source/argon1.sh
index 0d867aa..671b34e 100644
--- a/source/argon1.sh
+++ b/source/argon1.sh
@@ -18,14 +18,26 @@ argon_check_pkg() {
 	fi
 }
 
+# Check if Raspbian, Ubuntu, others
 CHECKPLATFORM="Others"
-# Check if Raspbian, otherwise Ubuntu
-grep -q -F 'Raspbian' /etc/os-release &> /dev/null
-if [ $? -eq 0 ]
+if [ -f "/etc/os-release" ]
+then
+	source /etc/os-release
+	if [ "$ID" = "raspbian" ]
+	then
+		CHECKPLATFORM="Raspbian"
+	elif [ "$ID" = "ubuntu" ]
+	then
+		CHECKPLATFORM="Ubuntu"
+	fi
+fi
+
+
+if [ "$CHECKPLATFORM" = "Raspbian" ]
 then
-	CHECKPLATFORM="Raspbian"
 	pkglist=(raspi-gpio python3-rpi.gpio python3-smbus i2c-tools)	
 else
+	# Todo handle lgpio
 	# Ubuntu has serial and i2c enabled
 	pkglist=(python3-rpi.gpio python3-smbus i2c-tools)
 fi
@@ -155,7 +167,9 @@ echo '		curpair = curconfig.split("=")' >> $powerbuttonscript
 echo '		tempcfg = float(curpair[0])' >> $powerbuttonscript
 echo '		fancfg = int(float(curpair[1]))' >> $powerbuttonscript
 echo '		if tempval >= tempcfg:' >> $powerbuttonscript
-echo '			if fancfg < 25:' >> $powerbuttonscript
+echo '			if fancfg < 1:' >> $powerbuttonscript
+echo '				return 0' >> $powerbuttonscript
+echo '			elif fancfg < 25:' >> $powerbuttonscript
 echo '				return 25' >> $powerbuttonscript
 echo '			return fancfg' >> $powerbuttonscript
 echo '	return 0' >> $powerbuttonscript
@@ -317,7 +331,6 @@ echo 'echo "Thank you."' >> $configscript
 
 echo 'get_number () {' >> $configscript
 echo '	read curnumber' >> $configscript
-echo '	re="^[0-9]+$"' >> $configscript
 echo '	if [ -z "$curnumber" ]' >> $configscript
 echo '	then' >> $configscript
 echo '		echo "-2"' >> $configscript
diff --git a/source/downloaded.txt b/source/downloaded.txt
deleted file mode 100644
index 48b96a1..0000000
--- a/source/downloaded.txt
+++ /dev/null
@@ -1 +0,0 @@
-Files downloaded on: 2022-04-06
diff --git a/source/downloaded_on.txt b/source/downloaded_on.txt
new file mode 100644
index 0000000..aaa11c0
--- /dev/null
+++ b/source/downloaded_on.txt
@@ -0,0 +1 @@
+2022-08-26 12:20:55 UTC