Fix run.sh due to weird sysconfig change, hope nothing breaks

Fixes #11

Author: C0rn3j

run.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 C_MODULES=(uinput hiddrv sc_by_bt remotepad cemuhook)
 C_VERSION_uinput=9
 C_VERSION_hiddrv=5
@@ -7,27 +8,29 @@ C_VERSION_remotepad=1
 C_VERSION_cemuhook=1
 
 function rebuild_c_modules() {
-	echo "lib$1.so is outdated or missing, building one"
+	echo "lib${1}.so is outdated or missing, building one"
 	echo "Please wait, this should be done only once."
 	echo ""
-	
-	# Next line generates string like 'lib.linux-x86_64-2.7', directory where libuinput.so was just generated
-	LIB=$( python3 -c 'import platform ; print("lib.linux-%s-%s.%s" % ((platform.machine(),) + platform.python_version_tuple()[0:2]))' )
+	# cpython-312-x86_64-linux-gnu
+#	SOABI=$(python3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI").split("-")[0:2])');
+
+	# lib.linux-x86_64-cpython-312 - directory where libuinput.so was just generated
+	LIB=$( python3 -c 'import platform; import sysconfig; soabi = sysconfig.get_config_var("SOABI").split("-")[0:2]; print(f"lib.linux-{platform.machine()}-{soabi[0]}-{soabi[1]}")' )
+	# .cpython-312-x86_64-linux-gnu.so
 	EXT_SUFFIX=$( python3 -c 'import sysconfig ; print(sysconfig.get_config_var("EXT_SUFFIX"))' )
-	
 	for cmod in ${C_MODULES[@]}; do
-		if [ -e build/$LIB/lib${cmod}${EXT_SUFFIX} ] ; then
-			rm build/$LIB/lib${cmod}${EXT_SUFFIX} || exit 1
+		if [[ -e build/${LIB}/lib${cmod}${EXT_SUFFIX} ]]; then
+			rm "build/${LIB}/lib${cmod}${EXT_SUFFIX}"
 		fi
 	done
-	
-	python3 setup.py build || exit 1
+
+	python3 setup.py build
 	echo ""
-	
+
 	for cmod in ${C_MODULES[@]}; do
-		if [ ! -e lib${cmod}.so ] ; then
-			ln -s build/$LIB/lib${cmod}${EXT_SUFFIX} ./lib${cmod}.so || exit 1
-			echo Symlinked ./lib${cmod}${EXT_SUFFIX} '->' build/$LIB/lib${cmod}.so
+		if [[ ! -e lib${cmod}.so ]] ; then
+			ln -s "build/${LIB}/lib${cmod}${EXT_SUFFIX}" "./lib${cmod}.so"
+			echo "Symlinked ./lib${cmod}.so '->' build/${LIB}/lib${cmod}${EXT_SUFFIX}"
 		fi
 	done
 	echo ""
@@ -39,17 +42,19 @@ cd "$(dirname "$0")"
 
 # Check if c modules are compiled and actual
 for cmod in ${C_MODULES[@]}; do
-	eval expected_version=\$C_VERSION_${cmod}
-	reported_version=$(PYTHONPATH="." python3 -c 'import os, ctypes; lib=ctypes.CDLL("./'lib${cmod}'.so"); print(lib.'${cmod}'_module_version())')
-	if [ x"$reported_version" != x"$expected_version" ] ; then
-		rebuild_c_modules ${cmod}
+	expected_version=\$C_VERSION_${cmod}
+	if ! reported_version=$(PYTHONPATH="." python3 -c 'import os, ctypes; lib=ctypes.CDLL("./'lib${cmod}'.so"); print(lib.'${cmod}'_module_version())'); then
+		echo "Failed to check module version for ${cmod}, this is normal"
+	fi
+	if [[ "$reported_version" != "${expected_version}" ]] ; then
+		rebuild_c_modules "${cmod}"
 	fi
 done
 
 # Set PATH
 SCRIPTS="$(pwd)/scripts"
 export PATH="$SCRIPTS":"$PATH"
-export PYTHONPATH=".":"$PYTHONPATH"
+export PYTHONPATH=".":"${PYTHONPATH-}"
 export SCC_SHARED="$(pwd)"
 
 # Execute

scripts/appimage-AppRun.sh

@@ -12,7 +12,7 @@ function dependency_check_failed() {
 	# This checks 4 different ways to open error message in addition to
 	# throwing it to screen directly
 	>&2 cat /tmp/scc.depcheck.$$.txt
-	
+
 	[ -e /usr/bin/zenity ] && run_and_die /usr/bin/zenity --error --no-wrap --text "$(cat /tmp/scc.depcheck.$$.txt)"
 	[ -e /usr/bin/yad ] && run_and_die /usr/bin/yad --error --text "$(cat /tmp/scc.depcheck.$$.txt)"
 	[ -e /usr/bin/Xdialog ] && run_and_die /usr/bin/Xdialog --textbox "/tmp/scc.depcheck.$$.txt" 10 100
@@ -32,7 +32,7 @@ rm /tmp/scc.depcheck.$$.txt || true
 
 # Pre-parse arguments
 ARG1=$1
-if [ "x$ARG1" == "x" ] ; then
+if [ "$ARG1" == "" ] ; then
 	# Start gui if no arguments are passed
 	ARG1="gui"
 else
@@ -44,4 +44,3 @@ export GDK_PIXBUF_MODULE_FILE=${APPDIR}/../$$-gdk-pixbuf-loaders.cache
 gdk-pixbuf-query-loaders >"$GDK_PIXBUF_MODULE_FILE"
 python3 ${APPDIR}/usr/bin/scc $ARG1 $@
 rm "$GDK_PIXBUF_MODULE_FILE" &>/dev/null
-

setup.py

@@ -37,7 +37,7 @@
 packages = [
 	# Required
 	'scc', 'scc.drivers', 'scc.lib',
-	# Usefull
+	# Useful
 	'scc.x11', 'scc.osd', 'scc.foreign',
 	# GUI
 	'scc.gui', 'scc.gui.ae', 'scc.gui.importexport', "scc.gui.creg"