Merge pull request #10413 from antonlacon/shellcheck

Shellcheck changes

scripts/autoreconf

@@ -8,8 +8,7 @@
 
 RECONF_DIR="${3}"
 
-if [ ! -f "${RECONF_DIR}/configure.in" \
-  -a ! -f "${RECONF_DIR}/configure.ac" ]; then
+if [ ! -f "${RECONF_DIR}/configure.in" ] && [ ! -f "${RECONF_DIR}/configure.ac" ]; then
   die "configure.in or configure.ac not found"
 fi
 

scripts/autoremove

@@ -5,7 +5,7 @@
 
 . config/options "${1}"
 
-if [ -d "${PKG_BUILD}" -a "${PKG_SECTION}" != "virtual" ]; then
+if [ -d "${PKG_BUILD}" ] && [ "${PKG_SECTION}" != "virtual" ]; then
   print_color CLR_AUTOREMOVE "AUTOREMOVE ${PKG_BUILD}"
   echo
   rm -r "${PKG_BUILD}"

scripts/checkdeps

@@ -97,7 +97,7 @@ perl_map=(
 ### PROJECT SPECIFIC REQUIREMENTS ###
 # Extend build scripts to look for distro/project/device checkdep scripts before adding further checks here
 # Native aarch64 on debian host needs to support rkbin (Rockchip) and aml_encrypt_* (Amlogic)
-if [ "$(uname -m)" = "aarch64" ] && [ "${PROJECT}" = "Rockchip" -o "${PROJECT}" = "Amlogic" ]; then
+if [ "$(uname -m)" = "aarch64" ] && { [ "${PROJECT}" = "Rockchip" ] || [ "${PROJECT}" = "Amlogic" ]; }; then
   dep_map[qemu-x86_64]=qemu-user-binfmt
   file_map[/usr/x86_64-linux-gnu/lib/ld-linux-x86-64.so.2]="libc6-amd64-cross"
   file_map[/usr/x86_64-linux-gnu/lib/libc.so.6]="libc6-amd64-cross"

scripts/extract

@@ -10,7 +10,7 @@ if [ -z "${2}" ]; then
   die "usage: ${0} package_name target_dir"
 fi
 
-[ -z "${PKG_URL}" -o -z "${PKG_SOURCE_NAME}" ] && die "${PKG_NAME}: PKG_URL or PKG_SOURCE_NAME undefined"
+{ [ -z "${PKG_URL}" ] || [ -z "${PKG_SOURCE_NAME}" ]; } && die "${PKG_NAME}: PKG_URL or PKG_SOURCE_NAME undefined"
 [ ! -d "${SOURCES}/${1}" ] && die "${PKG_NAME}: ${SOURCES}/${1} not found"
 [ ! -d "${2}" ] && die "${PKG_NAME}: target ${2} not found"
 
@@ -20,7 +20,7 @@ else
   FULL_SOURCE_PATH="${SOURCES}/${1}/${PKG_SOURCE_NAME}"
 fi
 
-if [ ! -f "${FULL_SOURCE_PATH}" -a ! -d "${FULL_SOURCE_PATH}" ]; then
+if [ ! -f "${FULL_SOURCE_PATH}" ] && [ ! -d "${FULL_SOURCE_PATH}" ]; then
   echo "error: File ${PKG_SOURCE_NAME} doesn't exist for package ${1}"
   echo "Have you called scripts/extract before scripts/get?"
   die

scripts/get_archive

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 _get_file_already_downloaded() {
-  [ ! -f "${PACKAGE}" -o ! -f "${STAMP_URL}" -o ! -f "${STAMP_SHA}" ] && return 1
-  [ -n "${PKG_SHA256}" -a "$(cat ${STAMP_SHA} 2>/dev/null)" != "${PKG_SHA256}" ] && return 1
+  { [ ! -f "${PACKAGE}" ] || [ ! -f "${STAMP_URL}" ] || [ ! -f "${STAMP_SHA}" ]; } && return 1
+  { [ -n "${PKG_SHA256}" ] && [ "$(cat ${STAMP_SHA} 2>/dev/null)" != "${PKG_SHA256}" ]; } && return 1
   return 0
 }
 
@@ -32,13 +32,13 @@ rm -f "${STAMP_URL}" "${STAMP_SHA}"
 
 NBGET=10
 NBCHKS=2
-while [ ${NBGET} -gt 0 -a ${NBCHKS} -gt 0 ]; do
+while [ ${NBGET} -gt 0 ] && [ ${NBCHKS} -gt 0 ]; do
   for url in "${PKG_URL}" "${PACKAGE_MIRROR}"; do
     rm -f "${PACKAGE}"
     if ${GET_CMD} "${url}"; then
       CALC_SHA256=$(sha256sum "${PACKAGE}" | cut -d" " -f1)
 
-      [ -z "${PKG_SHA256}" -o "${PKG_SHA256}" = "${CALC_SHA256}" ] && break 2
+      { [ -z "${PKG_SHA256}" ] || [ "${PKG_SHA256}" = "${CALC_SHA256}" ]; } && break 2
 
       if [ "${CHANGE_HASH}" = "yes" ]; then
         sed -e "s|^PKG_SHA256=.*|PKG_SHA256=\"${CALC_SHA256}\"|" -i "${PKG_DIR}/package.mk"
@@ -52,7 +52,7 @@ while [ ${NBGET} -gt 0 -a ${NBCHKS} -gt 0 ]; do
   NBGET=$((NBGET - 1))
 done
 
-if [ ${NBGET} -eq 0 -o ${NBCHKS} -eq 0 ]; then
+if [ ${NBGET} -eq 0 ] || [ ${NBCHKS} -eq 0 ]; then
   die "\nCannot get ${1} sources : ${PKG_URL}\nTry later!"
 else
   build_msg "CLR_INFO" "INFO" "Calculated checksum: ${CALC_SHA256}"

scripts/image

@@ -11,7 +11,7 @@ unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACK
 . config/show_config
 
 # Validate UBOOT_SYSTEM if it is specified
-if [ "${BOOTLOADER}" = "u-boot" -a -n "${DEVICE}" ]; then
+if [ "${BOOTLOADER}" = "u-boot" ] && [ -n "${DEVICE}" ]; then
   if [ -z "${UBOOT_SYSTEM}" ]; then
     ${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} >/dev/null
   else
@@ -206,7 +206,7 @@ if [ -d "${PROJECT_DIR}/${PROJECT}/filesystem" ]; then
 fi
 
 # Copy DEVICE related files to filesystem
-if [ -n "${DEVICE}" -a -d "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/filesystem" ]; then
+if [ -n "${DEVICE}" ] && [ -d "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/filesystem" ]; then
   cp -PR --remove-destination ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/filesystem/* ${INSTALL}
   # Install device specific systemd services
   for service in ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/filesystem/usr/lib/systemd/system/*.service; do
@@ -272,7 +272,7 @@ rm -rf ${FAKEROOT_SCRIPT}
 # Set permissions
 chmod 0644 ${TARGET_IMG}/${IMAGE_NAME}.system
 
-if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
+if [ "${1}" = "release" ] || [ "${1}" = "mkimage" ] || [ "${1}" = "noobs" ]; then
 
   RELEASE_DIR="target/${IMAGE_NAME}"
 
@@ -341,9 +341,10 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
     UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')"
     UUID_STORAGE="$(uuidgen)"
 
-    DEVICE_BOARDS=
-    if [ "${BOOTLOADER}" = "u-boot" -a -z "${UBOOT_SYSTEM}" -a -n "${DEVICE}" ]; then
+    if [ "${BOOTLOADER}" = "u-boot" ] && [ -z "${UBOOT_SYSTEM}" ] && [ -n "${DEVICE}" ]; then
       DEVICE_BOARDS=$(${SCRIPTS}/uboot_helper "${PROJECT}" "${DEVICE}")
+    else
+      DEVICE_BOARDS=""
     fi
 
     if [ -n "${DEVICE_BOARDS}" ]; then
@@ -502,6 +503,6 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
   fi
 fi
 
-if [ -n "$(ls -1 ${BUILD}/qa_checks/ 2>/dev/null)" ]; then
+if [ -d "${BUILD}/qa_checks" ] && [ -n "$(ls -1 ${BUILD}/qa_checks/)" ]; then
   log_qa_check "qa_issues" "QA issues present, please fix!\n$(find ${BUILD}/qa_checks/* -type f ! -name qa_issues)\n"
 fi

scripts/makefile_helper

@@ -10,7 +10,7 @@ set -e
 BUILD_ROOT=$(PROJECT= DEVICE= ARCH= . config/options "" && echo "${BUILD_ROOT}")
 BUILD_BASE=$(PROJECT= DEVICE= ARCH= . config/options "" && echo "${BUILD_BASE}")
 
-if [ -z "${BUILD_BASE}" -o -z "${BUILD_ROOT}" ]; then
+if [ -z "${BUILD_BASE}" ] || [ -z "${BUILD_ROOT}" ]; then
   # make sure variables are set before running an rm
   echo "error: ${0}: both BUILD_BASE and BUILD_ROOT must be set when running \"[clean|distclean]\"; aborting"
   exit 1

scripts/unpack

@@ -39,7 +39,7 @@ mkdir -p ${BUILD}/build
 # Perform a wildcard match on the package to ensure old versions are cleaned too
 PKG_DEEPHASH=
 for i in ${BUILD}/build/${PKG_NAME}-*; do
-  if [ -d ${i} -a -f "${i}/.libreelec-unpack" ]; then
+  if [ -d ${i} ] && [ -f "${i}/.libreelec-unpack" ]; then
     . "${i}/.libreelec-unpack"
     if [ "${STAMP_PKG_NAME}" = "${PKG_NAME}" ]; then
       [ -z "${PKG_DEEPHASH}" ] && PKG_DEEPHASH=$(calculate_stamp)
@@ -50,7 +50,7 @@ for i in ${BUILD}/build/${PKG_NAME}-*; do
   fi
 done
 
-if [ -d "${PKG_BUILD}" -a ! -f "${STAMP}" ]; then
+if [ -d "${PKG_BUILD}" ] && [ ! -f "${STAMP}" ]; then
   # stale pkg build dir
   ${SCRIPTS}/clean "${PKG_NAME}"
 fi
@@ -62,7 +62,7 @@ fi
 
 pkg_lock_status "ACTIVE" "${PKG_NAME}" "unpack"
 
-if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ] || pkg_call_exists_opt unpack; then
+if { [ -d "${SOURCES}/${PKG_NAME}" ] || [ -d "${PKG_DIR}/sources" ]; } || pkg_call_exists_opt unpack; then
   pkg_call_finish
   build_msg "CLR_UNPACK" "UNPACK" "${PKG_NAME}" "indent"
 
@@ -205,10 +205,11 @@ if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ] || pkg_call_exists
     for config in $(find "${PKG_BUILD}" -name config.guess | sed 's/config.guess//'); do
       build_msg "CLR_FIXCONFIG" "FIXCONFIG" "${config}"
 
-      [ -f "${config}/config.guess" -a -f ${TOOLCHAIN}/configtools/config.guess ] &&
-        cp -f ${TOOLCHAIN}/configtools/config.guess ${config}
-      [ -f "${config}/config.sub" -a -f ${TOOLCHAIN}/configtools/config.sub ] &&
-        cp -f ${TOOLCHAIN}/configtools/config.sub ${config}
+      for file in config.guess config.sub; do
+        if [ -f "${config}/${file}" && [ -f "${TOOLCHAIN}/configtools/${file}" ]; then
+          cp -f "${TOOLCHAIN}/configtools/${file}" "${config}/"
+        fi
+      done
     done
   fi
 fi
@@ -220,7 +221,7 @@ if [ "${PKG_SECTION}" != "virtual" ]; then
 
   PKG_DEEPHASH=$(calculate_stamp)
   for i in PKG_NAME PKG_DEEPHASH; do
-    echo "STAMP_${i}=\"${!i}\"" >>${STAMP}
+    echo "STAMP_${i}=\"${!i}\"" >>"${STAMP}"
   done
 fi