modernize multiple seqs and fix deprecated use of endCheckEmpty

seqs/pyload.sh

@@ -1,31 +1,22 @@
 #!/bin/bash
-toolName="pyload"
-toolBranch="stable"
-toolDownload="https://github.com/pyload/pyload.git"
-toolDeps="git liblept5 python python-crypto python-pycurl python-imaging python-sleekxmpp tesseract-ocr zip unzip python-openssl libmozjs-24-bin"
+readonly toolName="pyload"
+readonly toolBranch="stable"
+readonly toolDownload="https://github.com/pyload/pyload.git"
+readonly toolDeps="git liblept5 python python-crypto python-pycurl python-imaging python-sleekxmpp tesseract-ocr zip unzip python-openssl libmozjs-24-bin"
 # python-cryptography shall be implemented in future releases and replace pyhton-crypto
-toolDepsDebian="sudo git python-crypto python-pycurl python-pil python-sleekxmpp tesseract-ocr zip unzip pyhton-openssl libmozjs-60-dev"
-toolBuildDeps="rar unrar-nonfree"
+readonly toolDepsDebian="sudo git python-crypto python-pycurl python-pil python-sleekxmpp tesseract-ocr zip unzip pyhton-openssl libmozjs-60-dev"
+readonly toolBuildDeps="rar unrar-nonfree"
 
-# Get script working directory
-# (when called from a different directory)
-WDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >>/dev/null 2>&1 && pwd)"
-APTOPT=
-CONFIG=0
-SCRIPT_NAME=$(basename -- $0)
-SCRIPT_NAME=${SCRIPT_NAME%%.*}
-CONFIG_FILE_NAME="${SCRIPT_NAME}.cfg"
-CONFIG_FILE_TEMPLATE="$WDIR/${CONFIG_FILE_NAME}.example"
+sq_aptOpt=
 
 seq_config() {
-  initSeqConfig "$CONFIG_FILE_NAME" "$CONFIG_FILE_TEMPLATE"
-  if [ $? -eq 0 ] ; then
-    CONFIG=1
-  else
+  if ! initSeqConfig "${seq_configName:?}" "${seq_configTemplate:?}" ; then
     # End if no configuration file exists
     dry || return 1
   fi
-  quiet && APTOPT="-y"
+
+  interactive || sq_aptOpt="-y"
+  
   return 0
 }
 
@@ -41,7 +32,7 @@ step_1() {
 
 step_2_info() { echo "Install unrar-nonfree from source"; }
 step_2() {
-  exe apt-get build-dep ${toolBuildDeps} $APTOPT
+  exe apt-get build-dep ${toolBuildDeps} ${sq_aptOpt}
   exe cd /tmp
   exe apt-get source -b unrar-nonfree
   saveReturn $?
@@ -69,7 +60,7 @@ step_3() {
       error -e "Unrecognized target"
       return 1;;
   esac
-  exe apt-get install ${lDeps} $APTOPT
+  exe apt-get install ${lDeps} ${sq_aptOpt}
   saveReturn $?
   endReturn
   case "${1:-}" in
@@ -134,5 +125,7 @@ step_10() {
   echo "     Do so manually with: service $toolName start"
 }
 
+# shellcheck disable=SC2034 # Appears unused
 readonly sqr_minVersion=16
+# shellcheck disable=SC1091 # Don't follow this source
 . /usr/local/bin/sequencer.sh