Updated CI scripts

Author: dreibh

ci/build-tool

@@ -28,7 +28,6 @@
 #
 # Contact: thomas.dreibholz@gmail.com
 
-import distro
 import glob
 import http.client
 import os
@@ -43,8 +42,18 @@ import time
 import urllib.error
 import urllib.request
 
+if sys.version_info < (3, 9):
+   sys.stderr.write('ERROR: ' + sys.argv[0] + ' requires Python 3.9 or later!\n')
+   sys.exit(1)
+
 from typing import Any, Final, TextIO, cast
 
+try:
+   import distro
+except ImportError:
+   sys.stderr.write('ERROR: ' + sys.argv[0] + ' requires the Python distro package!\n')
+   sys.exit(1)
+
 
 # ###########################################################################
 # #### Constants                                                         ####

ci/ci-build

@@ -34,7 +34,7 @@ set -eu
 
 # ====== Check arguments ====================================================
 if [ $# -lt 1 ] ; then
-   echo >&2 "Usage: $0 compile|package|... ..."
+   echo >&2 "Usage: $0 compile|package ..."
    exit 1
 fi
 

ci/ci-setup

@@ -32,11 +32,24 @@
 set -eu
 
 
+# ====== Check arguments ====================================================
+if [ $# -lt 1 ] ; then
+   echo >&2 "Usage: $0 compile|package ..."
+   exit 1
+fi
+
+
 # ====== Check arguments ====================================================
 USE_PACKAGING=0
 while [ $# -gt 0 ] ; do
-   if [ "$1" == "package" ] ; then
+   TOOL="$1"
+   if [ "${TOOL}" == "compile" ] ; then
+      USE_PACKAGING=0
+   elif [ "$1" == "package" ] ; then
       USE_PACKAGING=1
+   else
+      echo >&2 "ERROR: Invalid setting of TOOL=${TOOL}!"
+      exit 1
    fi
    shift
 done

ci/get-dependencies

@@ -28,15 +28,24 @@
 #
 # Contact: thomas.dreibholz@gmail.com
 
-import distro
 import glob
 import os
 import re
 import subprocess
 import sys
 
+if sys.version_info < (3, 9):
+   sys.stderr.write('ERROR: ' + sys.argv[0] + ' requires Python 3.9 or later!\n')
+   sys.exit(1)
+
 from typing import Final, TextIO
 
+try:
+   import distro
+except ImportError:
+   sys.stderr.write('ERROR: ' + sys.argv[0] + ' requires the Python distro package!\n')
+   sys.exit(1)
+
 
 # ###### Extract Deb file dependencies ######################################
 debDepLine : Final[re.Pattern[str]] = re.compile(r'^(.*:[ \t]*)(.*)$')