fixed: selecting alternate GPIO set fails (setup script crashes)

kwindrem · Dec 8, 2023 · bc40cdf · bc40cdf
1 parent 05964ef
commit bc40cdf
Show file tree

Hide file tree

Showing 35 changed files with 22 additions and 11 deletions.
diff --git a/FileSets/v3.20~2/COMPLETE → FileSets/v3.12/COMPLETE b/FileSets/v3.20~2/COMPLETE → FileSets/v3.12/COMPLETE
diff --git a/FileSets/v3.20~2/LINKS_ONLY → FileSets/v3.12/LINKS_ONLY b/FileSets/v3.20~2/LINKS_ONLY → FileSets/v3.12/LINKS_ONLY
diff --git a/FileSets/v3.12/relaystate.py b/FileSets/v3.12/relaystate.py
@@ -0,0 +1 @@
+../v3.20~33/relaystate.py
diff --git a/FileSets/v3.20~4/COMPLETE → FileSets/v3.13/COMPLETE b/FileSets/v3.20~4/COMPLETE → FileSets/v3.13/COMPLETE
diff --git a/FileSets/v3.20~4/LINKS_ONLY → FileSets/v3.13/LINKS_ONLY b/FileSets/v3.20~4/LINKS_ONLY → FileSets/v3.13/LINKS_ONLY
diff --git a/FileSets/v3.13/relaystate.py b/FileSets/v3.13/relaystate.py
@@ -0,0 +1 @@
+../v3.20~33/relaystate.py
diff --git a/FileSets/v3.20~5/COMPLETE → FileSets/v3.20~14/COMPLETE b/FileSets/v3.20~5/COMPLETE → FileSets/v3.20~14/COMPLETE
diff --git a/FileSets/v3.20~5/LINKS_ONLY → FileSets/v3.20~14/LINKS_ONLY b/FileSets/v3.20~5/LINKS_ONLY → FileSets/v3.20~14/LINKS_ONLY
diff --git a/FileSets/v3.20~14/relaystate.py b/FileSets/v3.20~14/relaystate.py
@@ -0,0 +1 @@
+../v3.20~33/relaystate.py
diff --git a/FileSets/v3.20~7/COMPLETE → FileSets/v3.20~17/COMPLETE b/FileSets/v3.20~7/COMPLETE → FileSets/v3.20~17/COMPLETE
diff --git a/FileSets/v3.20~7/LINKS_ONLY → FileSets/v3.20~17/LINKS_ONLY b/FileSets/v3.20~7/LINKS_ONLY → FileSets/v3.20~17/LINKS_ONLY
diff --git a/FileSets/v3.20~17/relaystate.py b/FileSets/v3.20~17/relaystate.py
@@ -0,0 +1 @@
+../v3.20~33/relaystate.py
diff --git a/FileSets/v3.20~8/COMPLETE → FileSets/v3.20~18/COMPLETE b/FileSets/v3.20~8/COMPLETE → FileSets/v3.20~18/COMPLETE
diff --git a/FileSets/v3.20~18/LINKS_ONLY b/FileSets/v3.20~18/LINKS_ONLY
diff --git a/FileSets/v3.20~18/relaystate.py b/FileSets/v3.20~18/relaystate.py
@@ -0,0 +1 @@
+../v3.20~33/relaystate.py
diff --git a/FileSets/v3.20~2/relaystate.py b/FileSets/v3.20~2/relaystate.py
diff --git a/FileSets/v3.20~26/COMPLETE b/FileSets/v3.20~26/COMPLETE
diff --git a/FileSets/v3.20~26/LINKS_ONLY b/FileSets/v3.20~26/LINKS_ONLY
diff --git a/FileSets/v3.20~26/relaystate.py b/FileSets/v3.20~26/relaystate.py
@@ -0,0 +1 @@
+../v3.20~33/relaystate.py
diff --git a/FileSets/v3.20~29/COMPLETE b/FileSets/v3.20~29/COMPLETE
diff --git a/FileSets/v3.20~29/LINKS_ONLY b/FileSets/v3.20~29/LINKS_ONLY
diff --git a/FileSets/v3.20~29/relaystate.py b/FileSets/v3.20~29/relaystate.py
@@ -0,0 +1 @@
+../v3.20~33/relaystate.py
diff --git a/FileSets/v3.20~30/COMPLETE b/FileSets/v3.20~30/COMPLETE
diff --git a/FileSets/v3.20~30/LINKS_ONLY b/FileSets/v3.20~30/LINKS_ONLY
diff --git a/FileSets/v3.20~30/relaystate.py b/FileSets/v3.20~30/relaystate.py
@@ -0,0 +1 @@
+../v3.20~33/relaystate.py
diff --git a/FileSets/v3.20~33/COMPLETE b/FileSets/v3.20~33/COMPLETE
diff --git a/FileSets/v3.20~8/relaystate.py → FileSets/v3.20~33/relaystate.py b/FileSets/v3.20~8/relaystate.py → FileSets/v3.20~33/relaystate.py
diff --git a/FileSets/v3.20~8/relaystate.py.orig → FileSets/v3.20~33/relaystate.py.orig b/FileSets/v3.20~8/relaystate.py.orig → FileSets/v3.20~33/relaystate.py.orig
diff --git a/FileSets/v3.20~4/relaystate.py b/FileSets/v3.20~4/relaystate.py
diff --git a/FileSets/v3.20~5/relaystate.py b/FileSets/v3.20~5/relaystate.py
diff --git a/FileSets/v3.20~7/relaystate.py b/FileSets/v3.20~7/relaystate.py
diff --git a/ReadMe b/ReadMe
@@ -58,10 +58,14 @@ If /data/setupOptions/RpiGpioSetup/gpio_list exists it is used in place
 	of the one in the package directory.
 	This accommodates Relay HATs, etc. that use different GPIO pins.
 
-Setup:
+Installation:
 
-The easiest way to install this or other of my packages is to first install SetupHelper
-which you need to do anyway,
-then use its package install tool. Refer to the SetupHelper ReadMe for instructions.
+RpiGpioSetup requires that SetupHelper is installed first.
+
+The easiest way to install RpiGpioSetup is to do a "blind install" of SetupHelper
+	and then add the RpiGpioSetup package via the PackageManager menus.
+
+Refer to the SetupHelper ReadMe for instructions and for other install options:
+	https://github.com/kwindrem/SetupHelper
 
 
diff --git a/changes b/changes
@@ -1,3 +1,6 @@
+v4.2:
+	fixed: selecting alternate GPIO set fails (setup script crashes)
+
 v4.1:
 	added support for v3.11
 

diff --git a/setup b/setup
@@ -121,8 +121,8 @@ if [ $scriptAction == 'INSTALL' ] ; then
 	# use a alternate gpio list if option is set
 	elif [ -f "$setupOptionsDir/alternateGpio" ]; then
 		logMessage "installing ALTERNATE gpio_list"
-		updateActiveFile "$setupOptionsDir/gpio_listForCanHats" "$gpioListFile"
-	# use a legacy gpio list otherwise
+		updateActiveFile "$pkgFileSets/gpio_listForCanHats" "$gpioListFile"
+	# otherwise use a legacy gpio list
 	else
 		logMessage "installing LEGACY gpio_list"
 		updateActiveFile "$gpioListFile"

diff --git a/version b/version
@@ -1 +1 @@
-v4.1
+v4.2