Merge pull request #9057 from CvH/13.0/shfmt

cleanup script formatting

config/docker/source/bin/docker

@@ -8,4 +8,4 @@ name="$(basename $0)"
 oe_setup_addon "$name"
 
 docker rm "$name" 2>/dev/null
-docker run --name="$name" \
+docker run --name="$name"

config/noobs/partition_setup.sh

@@ -6,7 +6,8 @@
 MOUNTPOINT="/tmp/LibreELEC-System"
 
 md5sumCheck() {
-  ( cd $MOUNTPOINT
+  (
+    cd $MOUNTPOINT
     echo "checking MD5: $1"
     md5sum -c $1.md5
     if [ "$?" = "1" ]; then

packages/addons/browser/chrome/source/bin/chrome-downloader

@@ -14,7 +14,7 @@ CHROME_FILE="google-chrome-stable_@CHROME_VERSION@-1_amd64.deb"
 # check for enough free disk space
 if [ $(df -P . | awk 'END {print $4}') -lt 400000 ]; then
   kodi-send --action="Notification(Not enough disk space, at least 400MB are required,30000,${ICON})" >/dev/null
-  exit 0;
+  exit 0
 fi
 
 # remove install status and folders
@@ -41,7 +41,7 @@ rm -f ${CONTROL_FILE} ${DATA_FILE}
 (
   curl -# -O -C - https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${CHROME_FILE} 2>${DATA_FILE}
   touch ${CONTROL_FILE}
-) | \
+) |
   while [ : ]; do
     [ -f ${DATA_FILE} ] && prog="$(tr '\r' '\n' <${DATA_FILE} | tail -n 1 | sed -r 's/^[# ]+/#/;s/^[^0-9]*//g')" || prog=
     kodi-send --action="Notification(Downloading Chrome,\"${prog:-0.0%}\",3000,${ICON})" >/dev/null

packages/addons/browser/chrome/source/bin/chrome-start

@@ -12,8 +12,7 @@ if [ ! -f "$ADDON_DIR/extract.ok" ]; then
   chrome-downloader
 fi
 
-if [ -e $ADDON_HOME/env ]
+if [ -e $ADDON_HOME/env ]; then
-then
   . $ADDON_HOME/env
 fi
 
@@ -32,8 +31,7 @@ export GDK_PIXBUF_MODULE_FILE=$ADDON_DIR/config/pixbuf.loaders.cache
 export XENVIRONMENT=$ADDON_DIR/config/Xdefaults
 
 # start unclutter
-if [ "$HIDE_CURSOR" == "true" ]
+if [ "$HIDE_CURSOR" == "true" ]; then
-then
   unclutter &
   UNCLUTTER_PID=$!
 fi
@@ -57,19 +55,28 @@ case $VAAPI_MODE in
   *)
     LIBGL_ALWAYS_SOFTWARE='1'
     export LIBGL_ALWAYS_SOFTWARE
+    ;;
 esac
 export LIBVA_DRIVER_NAME LIBVA_DRIVERS_PATH
 
 # windowed
 case $WINDOW_MODE in
-  'maximized') chrome_OPTS="$chrome_OPTS --start-maximized";;
+  'maximized')
-  'kiosk') chrome_OPTS="$chrome_OPTS --kiosk";;
+    chrome_OPTS="$chrome_OPTS --start-maximized"
+    ;;
+  'kiosk')
+    chrome_OPTS="$chrome_OPTS --kiosk"
+    ;;
 esac
 
 # rasterization
 case $RASTER_MODE in
-  'off') chrome_OPTS="$chrome_OPTS --disable-accelerated-2d-canvas --disable-gpu-compositing";;
+  'off')
-  'force') chrome_OPTS="$chrome_OPTS --enable-gpu-rasterization --enable-accelerated-2d-canvas --ignore-gpu-blacklist";;
+    chrome_OPTS="$chrome_OPTS --disable-accelerated-2d-canvas --disable-gpu-compositing"
+    ;;
+  'force')
+    chrome_OPTS="$chrome_OPTS --enable-gpu-rasterization --enable-accelerated-2d-canvas --ignore-gpu-blacklist"
+    ;;
 esac
 
 # alsa
@@ -82,8 +89,7 @@ if [ "$AUDIO_DEVICE_TYPE" == "ALSA" ]; then
 fi
 
 # dark mode
-if [ "$DARK_MODE" == "true" ]
+if [ "$DARK_MODE" == "true" ]; then
-then
   chrome_OPTS="$chrome_OPTS --force-dark-mode"
 fi
 
@@ -102,8 +108,7 @@ LD_PRELOAD=/usr/lib/libGL.so $ADDON_DIR/chrome-bin/chrome \
   2>&1 | tee $ADDON_LOG_FILE
 
 # kill unclutter
-if [ "$HIDE_CURSOR" == "true" ]
+if [ "$HIDE_CURSOR" == "true" ]; then
-then
   kill $UNCLUTTER_PID
 fi
 

packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh

@@ -9,9 +9,15 @@
 HDHR_LOCKFILE="/var/lock/userspace-driver-hdhomerun.lck"
 HDHR_LOCKFD=99
 # obtain an exclusive lock
-exlock() { eval "exec $HDHR_LOCKFD>\"$HDHR_LOCKFILE\""; flock -x $HDHR_LOCKFD; }
+exlock() {
+  eval "exec $HDHR_LOCKFD>\"$HDHR_LOCKFILE\""
+  flock -x $HDHR_LOCKFD
+}
 # drop a lock
-unlock() { flock -u $HDHR_LOCKFD; flock -xn $HDHR_LOCKFD && rm -f "$HDHR_LOCKFILE"; }
+unlock() {
+  flock -u $HDHR_LOCKFD
+  flock -xn $HDHR_LOCKFD && rm -f "$HDHR_LOCKFILE"
+}
 # end locking mechanism
 
 # exclusive lock

packages/addons/service/jellyfin/source/bin/jellyfin-downloader

@@ -14,7 +14,7 @@ JELLYFIN_FILE="jellyfin_@JELLYFIN_VERSION@.tar.xz"
 # check for enough free disk space
 if [ $(df . | awk 'END {print $4}') -lt 200000 ]; then
   kodi-send --action="Notification(Not enough disk space, at least 200MB are required,30000,${ICON})" >/dev/null
-  exit 0;
+  exit 0
 fi
 
 # remove install status and folders
@@ -27,7 +27,7 @@ if [ -d ${ADDON_DIR}/libs ]; then
 fi
 
 # create tmp download dir
-TEMP_DIR=`mktemp -d`
+TEMP_DIR=$(mktemp -d)
 
 mkdir -p ${TEMP_DIR}/tmp_download
 if [ -d ${TEMP_DIR}/tmp_download ]; then
@@ -44,7 +44,7 @@ rm -f ${CONTROL_FILE} ${DATA_FILE}
 (
   curl -L -# -O -C - https://repo.jellyfin.org/files/server/portable/stable/v@JELLYFIN_VERSION@/any/${JELLYFIN_FILE} 2>${DATA_FILE}
   touch ${CONTROL_FILE}
-) | \
+) |
   while [ : ]; do
     [ -f ${DATA_FILE} ] && prog="$(tr '\r' '\n' <${DATA_FILE} | tail -n 1 | sed -r 's/^[# ]+/#/;s/^[^0-9]*//g')" || prog=
     kodi-send --action="Notification(Downloading Jellyfin,\"${prog:-0.0%}\",3000,${ICON})" >/dev/null

packages/addons/service/syncthing/source/bin/syncthing-service

@@ -6,10 +6,10 @@
 . /etc/profile
 oe_setup_addon service.system.syncthing
 
-STNODEFAULTFOLDER="1" syncthing -home=$ADDON_HOME           \
+STNODEFAULTFOLDER="1" syncthing \
+  -home=$ADDON_HOME \
   -gui-address="$gui_address" \
   -logflags=0 \
   -no-browser \
   -no-restart \
   &
-

packages/addons/service/tvheadend42/source/bin/tv_grab_file

@@ -3,8 +3,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
-if [ $# -lt 1 ]
+if [ $# -lt 1 ]; then
-then
   . /etc/profile
 
   ADDON_HOME="$HOME/.kodi/userdata/addon_data/service.tvheadend42"
@@ -53,24 +52,20 @@ dflag=
 vflag=
 cflag=
 
-for a in "$@"
+for a in "$@"; do
-do
   [ "$a" = "-d" -o "$a" = "--description"  ] && dflag=1
   [ "$a" = "-v" -o "$a" = "--version"      ] && vflag=1
   [ "$a" = "-c" -o "$a" = "--capabilities" ] && cflag=1
 done
 
-if [ -n "$dflag" ]
+if [ -n "$dflag" ]; then
-then
   echo "tv_grab_file is a simple grabber that can be configured through the addon settings from Kodi"
 fi
 
-if [ -n "$vflag" ]
+if [ -n "$vflag" ]; then
-then
   echo "1.0"
 fi
 
-if [ -n "$cflag" ]
+if [ -n "$cflag" ]; then
-then
   echo "baseline"
 fi

packages/addons/service/tvheadend43/source/bin/tv_grab_file

@@ -3,8 +3,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
-if [ $# -lt 1 ]
+if [ $# -lt 1 ]; then
-then
   . /etc/profile
 
   ADDON_HOME="$HOME/.kodi/userdata/addon_data/service.tvheadend43"
@@ -53,24 +52,20 @@ dflag=
 vflag=
 cflag=
 
-for a in "$@"
+for a in "$@"; do
-do
   [ "$a" = "-d" -o "$a" = "--description"  ] && dflag=1
   [ "$a" = "-v" -o "$a" = "--version"      ] && vflag=1
   [ "$a" = "-c" -o "$a" = "--capabilities" ] && cflag=1
 done
 
-if [ -n "$dflag" ]
+if [ -n "$dflag" ]; then
-then
   echo "tv_grab_file is a simple grabber that can be configured through the addon settings from Kodi"
 fi
 
-if [ -n "$vflag" ]
+if [ -n "$vflag" ]; then
-then
   echo "1.0"
 fi
 
-if [ -n "$cflag" ]
+if [ -n "$cflag" ]; then
-then
   echo "baseline"
 fi

packages/audio/alsa-utils/scripts/soundconfig

@@ -24,7 +24,7 @@ if [ -f $HOME/.config/sound.conf ]; then
   else
 
     # get card num
-  card=`echo $1 | sed 's/[^0-9]*//g'`
+    card=$(echo $1 | sed 's/[^0-9]*//g')
 
     # set common mixer params
     mixer "$card" Master 0db

packages/mediacenter/kodi/scripts/kodi-remote

@@ -23,7 +23,7 @@ Quit Remote     q or ctrl+c
 
 com() {
   kodi-send --action="$1" >/dev/null 2>&1
-  echo -ne "\r$1\e[K";
+  echo -ne "\r$1\e[K"
 }
 
 while true; do
@@ -47,6 +47,6 @@ while true; do
     +) com "VolumeUp" ;;
     $'\177') com "Back" ;;
     "") com "Select" ;;
-    q) exit
+    q) exit ;;
   esac
 done

packages/mediacenter/kodi/scripts/kodi-safe-mode

@@ -8,8 +8,7 @@ KODI_ROOT=$HOME/.kodi
 KODI_ROOT_FAILED=$KODI_ROOT.FAILED
 BOOT_STATUS=$HOME/.config/boot.status
 
-process_boot_status()
+process_boot_status() {
-{
   BOOT_STATE="$(cat $BOOT_STATUS 2>/dev/null)"
 
   if [ "${BOOT_STATE}" = "SAFE" ]; then

packages/mediacenter/kodi/scripts/pastekodi

@@ -41,9 +41,15 @@ OUTPUT="/usr/bin/pastebinit"
 
 while getopts ":hc" opt; do
   case ${opt} in
-    c) OUTPUT="cat";;
+    c)
-    ?) usage "${OPTARG}";;
+      OUTPUT="cat"
-    h) usage;;
+      ;;
+    ?)
+      usage "${OPTARG}"
+      ;;
+    h)
+      usage
+      ;;
   esac
 done
 

packages/mediacenter/kodi/sleep.d/openelec-sleep.sh

@@ -5,8 +5,7 @@
 
 . /etc/profile
 
-run_scripts()
+run_scripts() {
-{
   list_scripts $1
   for script in $SCRIPTS; do
     progress "running sleep script $script ($1)..."
@@ -14,8 +13,7 @@ run_scripts()
   done
 }
 
-list_scripts()
+list_scripts() {
-{
   case $1 in
     pre)
       SCRIPTS=$(ls /usr/lib/systemd/system-sleep.serial/ | sort)

packages/sysutils/busybox/scripts/getedid

@@ -26,7 +26,6 @@ help() {
   echo "And then use: getedid create"
 }
 
-
 # check for GPU and store string
 check_gpu() {
   if lspci | grep -i vga | grep -i -q -E 'intel|amd'; then
@@ -39,7 +38,6 @@ check_gpu() {
   fi
 }
 
-
 # run this first if the user already has a custom EDID but want to create a new one (TV or AVR change)
 del_edid() {
   if [ "$gpu" = "intel/amd" ]; then
@@ -63,7 +61,6 @@ del_edid() {
   fi
 }
 
-
 # run main script depending on the GPU
 run() {
   if [ "$gpu" = "intel/amd" ]; then
@@ -73,19 +70,16 @@ run() {
   fi
 }
 
-
 # mounting /flash to rw
 mount_rw() {
   mount -o remount,rw /flash
 }
 
-
 # mounting /flash to ro
 mount_ro() {
   mount -o remount,ro /flash
 }
 
-
 # remount /flash to ro and reboot
 sys_reboot() {
   mount_ro
@@ -94,7 +88,6 @@ sys_reboot() {
   reboot
 }
 
-
 # check syslinux.cfg and/or extlinux.conf
 check_file() {
   # check boot system
@@ -122,7 +115,6 @@ check_file() {
   fi
 }
 
-
 check_content() {
   # check if changes are already made to $file and exit if yes
   if grep -q "initrd=/edid.cpio" $file; then
@@ -131,7 +123,6 @@ check_content() {
   fi
 }
 
-
 create_edid() {
   # create edid
   mkdir -p /tmp/cpio/lib/firmware/edid
@@ -139,13 +130,11 @@ create_edid() {
   mkdir -p /storage/.config/firmware/edid
   cp /tmp/cpio/lib/firmware/edid/edid.bin /storage/.config/firmware/edid
 
-
   # create cpio archive
   cd /tmp/cpio/
   find . -print | cpio -ov -H newc >/storage/edid.cpio
 }
 
-
 intel_amd() {
   # check which output is connnected:
   counter=0
@@ -183,7 +172,6 @@ intel_amd() {
   sys_reboot
 }
 
-
 nvidia() {
   # check if xorg.conf already exists
   if [ -f /storage/.config/xorg.conf -o -f /storage/.config/xorg-nvidia.conf ]; then
@@ -191,7 +179,6 @@ nvidia() {
     exit 6
   fi
 
-
   # check for multi-montior setup
   monitors="$(grep -i -w "connected" /var/log/Xorg.0.log | grep -i -o "dfp-[0-9]" | sort -u | wc -l)"
   if [ "$monitors" -gt "1" ]; then
@@ -199,13 +186,11 @@ nvidia() {
     exit 7
   fi
 
-
   # set debug and restart Xorg
   cp /etc/X11/xorg-nvidia.conf /storage/.config/xorg.conf
   sed -i 's/"ModeDebug" "false"/"ModeDebug" "true"/g' /storage/.config/xorg.conf
   systemctl restart xorg.service
 
-
   # get port
   nv_port="$(grep -i -w connected /var/log/Xorg.0.log | grep -i -o "dfp-[0-9]" | sort -u)"
   nvidia-xconfig --extract-edids-from-file=/var/log/Xorg.0.log --extract-edids-output-file=/storage/.config/edid.bin 1>/dev/null
@@ -223,7 +208,6 @@ nvidia() {
   systemctl restart xorg.service
 }
 
-
 # start script from here
 case "$1" in
   'create')

packages/sysutils/busybox/scripts/vfd-clock

@@ -4,8 +4,7 @@
 # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
 
 do_start() {
-  while sleep 1
+  while sleep 1; do
-  do
     printf "%4s" "$(date +'%l %M' | tr -d '[:space:]')" >"$LED_PATH_TEXT"
     if [ "$LED_COLON" = "off" ]; then
       echo "1" >"$LED_PATH_COLON"

packages/sysutils/systemd/scripts/network-base-setup

@@ -6,7 +6,6 @@ check_hosts() {
   grep -v "^#" /run/libreelec/hosts | grep "${1}"
 }
 
-
 # setup hostname
 if [ -f /storage/.cache/hostname ]; then
   cat /storage/.cache/hostname >/proc/sys/kernel/hostname
@@ -44,4 +43,3 @@ nameserver 8.8.8.8
 nameserver 8.8.4.4
 EOF
 fi
-

packages/sysutils/systemd/scripts/systemd-timesyncd-setup

@@ -19,4 +19,3 @@ NTP=$NTP_SERVERS
 EOF
   fi
 fi
-

packages/tools/bcm2835-bootloader/files/update.sh

@@ -36,10 +36,10 @@ rm -rf $BOOT_ROOT/start_x.elf
 if [ ! -f $BOOT_ROOT/config.txt ]; then
   cp -p $SYSTEM_ROOT/usr/share/bootloader/config.txt $BOOT_ROOT
 else
-  CONFIG_TXT_VERSION=$( \
+  CONFIG_TXT_VERSION=$(
-    grep "^# config.txt version v[0-9]\+" $BOOT_ROOT/config.txt | \
+    grep "^# config.txt version v[0-9]\+" $BOOT_ROOT/config.txt |
-    head -n 1 | \
+      head -n 1 |
-    sed 's/^# config.txt version v\([0-9]\+\) .*$/\1/' \
+      sed 's/^# config.txt version v\([0-9]\+\) .*$/\1/'
   )
   if [ ${CONFIG_TXT_VERSION:-0} -lt $MIN_CONFIG_TXT_VERSION ]; then
     mv -f $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.old

packages/tools/emmctool/scripts/emmctool

@@ -170,6 +170,7 @@ do_write(){
       *)
         echo "error: ${2} is not a valid image file!"
         exit 1
+        ;;
     esac
   else
     echo "error: ${2} not found!"

packages/x11/xserver/xorg-server/scripts/xorg-configure

@@ -107,4 +107,3 @@ logger -t Xorg "### creating needed directories and symlinks ###"
 logger -t Xorg "### starting Xorg with '${DISPLAY} vt01 ${XORG_ARGS}' ###"
 mkdir -p /run/libreelec
 echo "XORG_ARGS=\"${XORG_ARGS}\"" >/run/libreelec/xorg-settings.conf
-

projects/Generic/devices/x11/filesystem/usr/bin/intel-fullrange.sh

@@ -2,14 +2,15 @@
 FB_TYPE="$(grep '^0 ' /proc/fb | sed 's/[^[:space:]] //')"
 
 if [ "$FB_TYPE" == "inteldrmfb" ] || echo "$FB_TYPE" | grep -q "^i9[0-9]*drmfb$"; then
-  OUTPUT=`/usr/bin/xrandr -display :0 -q | sed '/ connected/!d;s/ .*//;q'`
+  OUTPUT=$(/usr/bin/xrandr -display :0 -q | sed '/ connected/!d;s/ .*//;q')
   for out in $OUTPUT; do
     # Hack - something is not yet fully right
     /usr/bin/xrandr -display :0 --output $out --set "Broadcast RGB" "Full"
     # Seems there is a little race somewhere on some outputs
     # Turn the display shortly off and on again
     if [ -e "/storage/.config/forcedisplay" ]; then
-      /usr/bin/xrandr -display :0 --output $out --off ; /usr/bin/xrandr -display :0 --output $out --auto
+      /usr/bin/xrandr -display :0 --output $out --off
+      /usr/bin/xrandr -display :0 --output $out --auto
     fi
   done
 fi

projects/NXP/devices/iMX6/filesystem/usr/bin/rdu-network

@@ -114,4 +114,3 @@ case "${ACTION}" in
     exit 2
     ;;
 esac
-

scripts/build

@@ -60,10 +60,18 @@ ${SCRIPTS}/unpack "${PKG_NAME}" "${PARENT_PKG}"
 # build dependencies, only when PKG_DEPENDS_? is filled
 unset _pkg_depends
 case "${TARGET}" in
-  "target") _pkg_depends="${PKG_DEPENDS_TARGET}";;
+  "target")
-  "host") _pkg_depends="${PKG_DEPENDS_HOST}";;
+    _pkg_depends="${PKG_DEPENDS_TARGET}"
-  "init") _pkg_depends="${PKG_DEPENDS_INIT}";;
+    ;;
-  "bootstrap") _pkg_depends="${PKG_DEPENDS_BOOTSTRAP}";;
+  "host")
+    _pkg_depends="${PKG_DEPENDS_HOST}"
+    ;;
+  "init")
+    _pkg_depends="${PKG_DEPENDS_INIT}"
+    ;;
+  "bootstrap")
+    _pkg_depends="${PKG_DEPENDS_BOOTSTRAP}"
+    ;;
 esac
 
 if is_sequential_build; then
@@ -171,7 +179,6 @@ if [ "${BUILD_WITH_DEBUG}" != "yes" ] && flag_enabled "strip" "yes"; then
   TARGET_MESON_OPTS+=" -Dstrip=true"
 fi
 
-
 # configure HOST build defaults
 HOST_CONFIGURE_OPTS="--host=${HOST_NAME} \
                      --build=${HOST_NAME} \
@@ -227,9 +234,15 @@ cd "${PKG_BUILD}"
 
 if [ -f "${PKG_CONFIGURE_SCRIPT}" -o -f "${PKG_CMAKE_SCRIPT}" -o -f "${PKG_MESON_SCRIPT}" ]; then
   case "${TARGET}" in
-    "target")    PKG_REAL_BUILD="${PKG_BUILD}/.${TARGET_NAME}" ;;
+    "target")
-    "host")      PKG_REAL_BUILD="${PKG_BUILD}/.${HOST_NAME}" ;;
+      PKG_REAL_BUILD="${PKG_BUILD}/.${TARGET_NAME}"
-    "init")      PKG_REAL_BUILD="${PKG_BUILD}/.${TARGET_NAME}-${TARGET}" ;;
+      ;;
+    "host")
+      PKG_REAL_BUILD="${PKG_BUILD}/.${HOST_NAME}"
+      ;;
+    "init")
+      PKG_REAL_BUILD="${PKG_BUILD}/.${TARGET_NAME}-${TARGET}"
+      ;;
     "bootstrap") PKG_REAL_BUILD="${PKG_BUILD}/.${HOST_NAME}-${TARGET}" ;;
   esac
   mkdir -p "${PKG_REAL_BUILD}"
@@ -433,7 +446,7 @@ else
   case "${PKG_TOOLCHAIN}:${TARGET}" in
     # ninja based builds
     "meson:target" | "cmake:target")
-      [ "${INSTALL_TO_SYSROOT}" = "yes" ] && \
+      [ "${INSTALL_TO_SYSROOT}" = "yes" ] &&
         DESTDIR=${SYSROOT_PREFIX} ninja install ${PKG_MAKEINSTALL_OPTS_TARGET}
       DESTDIR=${INSTALL} ninja install ${PKG_MAKEINSTALL_OPTS_TARGET}
       ;;
@@ -449,7 +462,7 @@ else
 
     # make based builds
     "configure:target" | "cmake-make:target" | "autotools:target" | "make:target")
-      [ "${INSTALL_TO_SYSROOT}" = "yes" ] && \
+      [ "${INSTALL_TO_SYSROOT}" = "yes" ] &&
         make install DESTDIR=${SYSROOT_PREFIX} -j1 ${PKG_MAKEINSTALL_OPTS_TARGET}
       make install DESTDIR=${INSTALL} ${PKG_MAKEINSTALL_OPTS_TARGET}
       ;;

scripts/clean

@@ -49,4 +49,3 @@ if [ "${1}" = "--all" -a -n "${2}" ]; then
 elif [ -n "${1}" ]; then
   clean_package "${1}"
 fi
-

scripts/create_addon

@@ -51,10 +51,19 @@ get_addons() {
   local count=0 validpkg
 
   case ${1} in
-    binary)   paths="^${ROOT}/packages/mediacenter/kodi-binary-addons/";;
+    binary)
-    official) paths="^${ROOT}/packages/addons/";;
+      paths="^${ROOT}/packages/mediacenter/kodi-binary-addons/"
-    all)      paths="^${ROOT}/packages/|^${ROOT}/projects/.*/packages/";;
+      ;;
-    *)        paths="^${ROOT}/packages/|^${ROOT}/projects/.*/packages/"; filter="${1}";;
+    official)
+      paths="^${ROOT}/packages/addons/"
+      ;;
+    all)
+      paths="^${ROOT}/packages/|^${ROOT}/projects/.*/packages/"
+      ;;
+    *)
+      paths="^${ROOT}/packages/|^${ROOT}/projects/.*/packages/"
+      filter="${1}"
+      ;;
   esac
 
   exit() { exited=1; }
@@ -143,11 +152,21 @@ show_only="no"
 # read addons from parameter list
 while [ $# -gt 0 ]; do
   case ${1} in
-    --help)         usage 0;;
+    --help)
-    --show-only)    show_only="yes";;
+      usage 0
-    --*)            usage 1;;
+      ;;
-    -*)             addons_drop+=" $(get_addons ${1:1})";;
+    --show-only)
-    *)              addons+=" $(get_addons ${1})";;
+      show_only="yes"
+      ;;
+    --*)
+      usage 1
+      ;;
+    -*)
+      addons_drop+=" $(get_addons ${1:1})"
+      ;;
+    *)
+      addons+=" $(get_addons ${1})"
+      ;;
   esac
   shift
 done

scripts/get

@@ -32,11 +32,14 @@ if [ -n "${PKG_URL}" -a -n "${PKG_SOURCE_NAME}" ]; then
   # determine get handler based on protocol and/or filename
   case "${PKG_URL}" in
     git://* | *.git)
-      get_handler="git";;
+      get_handler="git"
+      ;;
     file://*)
-      get_handler="file";;
+      get_handler="file"
+      ;;
     *)
-      get_handler="archive";;
+      get_handler="archive"
+      ;;
   esac
 
   if ! listcontains "${GET_HANDLER_SUPPORT}" "${get_handler}"; then

scripts/image

@@ -68,11 +68,21 @@ if [ "${LIBREELEC_VERSION}" = "devel" ]; then
   GIT_ABBREV=${GIT_HASH:0:7}
   DEVEL_VERSION=${LIBREELEC_VERSION}
   case "${BUILD_PERIODIC}" in
-    nightly) LIBREELEC_VERSION=nightly-$(date +%Y%m%d)-${GIT_ABBREV};;
+    nightly)
-    daily)   LIBREELEC_VERSION=daily-$(date +%Y%j)-${GIT_ABBREV};;
+      LIBREELEC_VERSION=nightly-$(date +%Y%m%d)-${GIT_ABBREV}
-    weekly)  LIBREELEC_VERSION=weekly-$(date +%G%V)-${GIT_ABBREV};;
+      ;;
-    monthly) LIBREELEC_VERSION=monthly-$(date +%Y%m)-${GIT_ABBREV};;
+    daily)
-    *)       LIBREELEC_VERSION=devel-$(date +%Y%m%d%H%M%S)-${GIT_ABBREV};;
+      LIBREELEC_VERSION=daily-$(date +%Y%j)-${GIT_ABBREV}
+      ;;
+    weekly)
+      LIBREELEC_VERSION=weekly-$(date +%G%V)-${GIT_ABBREV}
+      ;;
+    monthly)
+      LIBREELEC_VERSION=monthly-$(date +%Y%m)-${GIT_ABBREV}
+      ;;
+    *)
+      LIBREELEC_VERSION=devel-$(date +%Y%m%d%H%M%S)-${GIT_ABBREV}
+      ;;
   esac
 fi
 
@@ -215,7 +225,7 @@ fi
 
 # Run depmod for base overlay modules
 MODVER=$(basename $(ls -d ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/*))
-find ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/ -name *.ko | \
+find ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/ -name *.ko |
   sed -e "s,${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/,," \
     >${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/modules.order
 ${TOOLCHAIN}/bin/depmod -b ${INSTALL}/usr/lib/kernel-overlays/base -a -e -F "$(get_install_dir linux)/.image/System.map" ${MODVER} 2>&1
@@ -304,9 +314,10 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
   cp ${TARGET_IMG}/${IMAGE_NAME}.kernel ${RELEASE_DIR}/target/KERNEL
 
   # Create md5sum's
-  ( cd ${RELEASE_DIR};
+  (
-    md5sum -t target/SYSTEM > target/SYSTEM.md5;
+    cd ${RELEASE_DIR}
-    md5sum -t target/KERNEL > target/KERNEL.md5;
+    md5sum -t target/SYSTEM >target/SYSTEM.md5
+    md5sum -t target/KERNEL >target/KERNEL.md5
   )
 
   # Create target directory
@@ -319,7 +330,8 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
   tar cf ${TARGET_IMG}/${IMAGE_NAME}.tar -C target ${IMAGE_NAME}
 
   # Create sha256 checksum of tarball
-  ( cd ${TARGET_IMG}
+  (
+    cd ${TARGET_IMG}
     sha256sum ${IMAGE_NAME}.tar >${IMAGE_NAME}.tar.sha256
   )
 
@@ -445,9 +457,10 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
     done
 
     # Create md5sum's
-    ( cd ${RELEASE_DIR}/${NOOBS_DISTRO}/System;
+    (
-      md5sum -t SYSTEM > SYSTEM.md5;
+      cd ${RELEASE_DIR}/${NOOBS_DISTRO}/System
-      md5sum -t kernel.img > kernel.img.md5;
+      md5sum -t SYSTEM >SYSTEM.md5
+      md5sum -t kernel.img >kernel.img.md5
     )
 
     # Copy additional files
@@ -476,7 +489,8 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
     tar cf ${TARGET_IMG}/${IMAGE_NAME}-${1}.tar -C ${TARGET_IMG} ${IMAGE_NAME}-${1}
 
     # Create sha256 checksum of tarball
-    ( cd ${TARGET_IMG}
+    (
+      cd ${TARGET_IMG}
       sha256sum ${IMAGE_NAME}-${1}.tar >${IMAGE_NAME}-${1}.tar.sha256
     )
   fi
@@ -490,4 +504,3 @@ fi
 if [ -n "$(ls -1 ${BUILD}/qa_checks/ 2>/dev/null)" ]; then
   log_qa_check "qa_issues" "QA issues present, please fix!\n$(find ${BUILD}/qa_checks/* -type f ! -name qa_issues)\n"
 fi
-

scripts/install

@@ -73,8 +73,7 @@ mkdir -p ${INSTALL}
 if [ "${TARGET}" = "target" ]; then
   for PKG_TMP_DIR in ${PKG_DIR} \
     ${PROJECT_DIR}/${PROJECT}/packages/${PKG_NAME} \
-                     ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/${PKG_NAME} \
+    ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/${PKG_NAME}; do
-                     ; do
 
     [ -d ${PKG_TMP_DIR} ] || continue
 

scripts/install_addon

@@ -80,7 +80,8 @@ if [ "${ADDON_JENKINS}" = "yes" ]; then
   mkdir -p "${ADDON_JENKINS_DIR}"
   cd ${ADDON_INSTALL_DIR}
   ${TOOLCHAIN}/bin/7za a -mx0 -bsp0 -bso0 -tzip ${ADDON_JENKINS_DIR}/${ADDON_JENKINS_ADDON_NAME}.zip ${PKG_ADDON_ID}-${ADDONVER}.zip resources/
-  ( cd ${ADDON_JENKINS_DIR}
+  (
+    cd ${ADDON_JENKINS_DIR}
     sha256sum ${ADDON_JENKINS_ADDON_NAME}.zip >${ADDON_JENKINS_ADDON_NAME}.zip.sha256
   )
   build_msg "CLR_INFO" "*** creating ${ADDON_JENKINS_ADDON_NAME}.zip for Jenkins complete ***"

scripts/pkgjson

@@ -51,6 +51,6 @@ fi
 # pipefail: return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
 set -o pipefail
 
-cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} | \
+cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} |
   xargs --max-args=64 --max-procs="$(nproc)" "$0" --worker
 exit $?

scripts/unpack

@@ -205,9 +205,9 @@ 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 ] && \
+      [ -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 ] && \
+      [ -f "${config}/config.sub" -a -f ${TOOLCHAIN}/configtools/config.sub ] &&
         cp -f ${TOOLCHAIN}/configtools/config.sub ${config}
     done
   fi

tools/RPi/gen-rpi-kodi-patch.sh

@@ -10,8 +10,7 @@ fi
 
 DEPTH=1000
 
-usage()
+usage() {
-{
   local me="$(basename $0)"
 
   echo "Usage:   ${me} <popcornmix-branch> <sha>|<xbmc branch>"

tools/checkunpack

@@ -37,12 +37,25 @@ USING_FILTER="no"
 
 while getopts "f:cvSh" opt; do
   case ${opt} in
-    f) FILTER="${OPTARG}"; USING_FILTER="yes";;
+    f)
-    c) RMPROGRESS="yes";;
+      FILTER="${OPTARG}"
-    v) VERBOSE="yes";;
+      USING_FILTER="yes"
-    S) SHOW_SKIPPED="yes";;
+      ;;
-    h) usage;;
+    c)
-    *) usage;;
+      RMPROGRESS="yes"
+      ;;
+    v)
+      VERBOSE="yes"
+      ;;
+    S)
+      SHOW_SKIPPED="yes"
+      ;;
+    h)
+      usage
+      ;;
+    *)
+      usage
+      ;;
   esac
 done
 
@@ -59,7 +72,10 @@ SKIPPED="$(cut -d' ' -f1 ${RESTART_FILE} 2>/dev/null | sort -u | wc -l || true)"
 [ "${USING_FILTER}" = "no" -a "${SKIPPED:-0}" -ne 0 ] && echo -e "WARNING: skipping ${SKIPPED} packages.\n" >&2
 
 for pkg_name in $(get_all_package_names | grep -E "${FILTER}"); do
-  stamp=$(source_package ${pkg_name}; calculate_stamp)
+  stamp=$(
+    source_package ${pkg_name}
+    calculate_stamp
+  )
   if [ -z "${stamp}" ]; then
     [ "${SHOW_SKIPPED}" = "yes" ] && printf "Checking: %-40s IGNORED\n" "${pkg_name}"
     continue

tools/download-cleaner

@@ -25,7 +25,6 @@ BUILD_SOURCES="false"
 REPLACE_OLD="false"
 NEW_SOURCES="${NEW_SOURCES_DIR:-${SOURCES}.new}"
 
-
 # helper functions
 help() {
   echo "Usage: ${0} [-hdfbr]"
@@ -37,7 +36,6 @@ help(){
   echo "  -r replace old SOURCES when rebuilding (default: no)"
 }
 
-
 # command line opts
 while getopts hdfrb OPT; do
   case "${OPT}" in
@@ -67,7 +65,6 @@ done
 
 shift $((${OPTIND} - 1))
 
-
 # sanity checking
 if [ ! -d "${SOURCES}" ]; then
   die "error: ${SOURCES} is not a directory"
@@ -75,7 +72,6 @@ elif [ "${DESTRUCTIVE_RUN}" = "true" -a "${BUILD_SOURCES}" = "true" ]; then
   die "error: options '-d' and '-b' are mutually exclusive"
 fi
 
-
 # main
 # process files in SOURCES
 for SOURCE_PACKAGE in $(find "${SOURCES}/" -mindepth 1 -type d); do

tools/download-tool

@@ -21,11 +21,12 @@ case $1 in
   -h | --help)
     help
     exit 0
+    ;;
 esac
 
 for package in $(find packages/ -name package.mk); do
   if [ -n "$(echo $package | grep addons)" -a -z "$ALL_PACKAGES" ]; then
     continue
   fi
-  ./scripts/get $(basename `dirname $package`)
+  ./scripts/get $(basename $(dirname $package))
 done

tools/ffmpeg/gen-patches.sh

@@ -13,7 +13,10 @@ if [ $# -eq 0 ]; then
 fi
 
 FFMPEG_ROOT="$(pwd)"
-LE_ROOT="$(cd $(dirname $0)/../.. ; pwd)"
+LE_ROOT="$(
+  cd $(dirname $0)/../..
+  pwd
+)"
 
 create_patch() {
   FEATURE_SET="$1"

tools/mkpkg/mkpkg_boblightd

@@ -8,7 +8,7 @@ echo "getting sources..."
 
 echo "getting version..."
 cd boblightd-latest
-    SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
+SVN_REV=$(LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //')
 echo $SVN_REV
 cd ..
 

tools/mkpkg/mkpkg_libcec

@@ -11,7 +11,7 @@ echo "getting sources..."
 
 cd libcec.git
 git pull
-    GIT_REV=`git log -n1 --format=%H`
+GIT_REV=$(git log -n1 --format=%H)
 cd ..
 
 echo "copying sources..."

tools/mkpkg/mkpkg_media_build

@@ -32,7 +32,7 @@ fi
 cd media_build/
 git pull
 git checkout $MEDIA_BUILD_HASH
-  GIT_LOG_MEDIA_BUILD=`git log --pretty=oneline -n1`
+GIT_LOG_MEDIA_BUILD=$(git log --pretty=oneline -n1)
 
 cd $DVB_MKPKG_FOLDER/
 
@@ -45,8 +45,8 @@ echo "getting sources ..."
 #get log
 cd media_tree/
 git pull
-  GIT_LOG_MEDIA_TREE=`git log --pretty=oneline -n1`
+GIT_LOG_MEDIA_TREE=$(git log --pretty=oneline -n1)
-  GIT_REV=`git log -n1 --pretty=format:"%ad" --date=short`
+GIT_REV=$(git log -n1 --pretty=format:"%ad" --date=short)
 
 cd $DVB_MKPKG_FOLDER/
 

tools/mkpkg/mkpkg_pvr

@@ -52,7 +52,7 @@ fi
 cd media_build/
 git pull
 git checkout $MEDIA_BUILD_HASH
-  GIT_LOG_MEDIA_BUILD=`git log --pretty=oneline -n1`
+GIT_LOG_MEDIA_BUILD=$(git log --pretty=oneline -n1)
 
 cd $DVB_MKPKG_FOLDER/
 
@@ -65,8 +65,8 @@ echo "getting sources ..."
 #get log
 cd media_tree/
 git pull
-  GIT_LOG_MEDIA_TREE=`git log --pretty=oneline -n1`
+GIT_LOG_MEDIA_TREE=$(git log --pretty=oneline -n1)
-  GIT_REV=`git log -n1 --pretty=format:"%ad" --date=short`
+GIT_REV=$(git log -n1 --pretty=format:"%ad" --date=short)
 
 # hack/workaround for borked upstream kernel/media_build
 # without removing atomisp there a lot additional includes that

tools/mkpkg/mkpkg_rtmpdump

@@ -11,7 +11,7 @@ echo "getting sources..."
 
 cd rtmpdump.git
 git pull
-    GIT_REV=`git log -n1 --format=%H`
+GIT_REV=$(git log -n1 --format=%H)
 cd ..
 
 echo "copying sources..."

tools/mkpkg/update_retroplayer-addons

@@ -45,7 +45,6 @@ while [ $# -ne 0 ]; do
   esac
 done
 
-
 if [ $# -eq 0 -o $# -gt 2 ]; then
   usage
   exit 1
@@ -231,4 +230,3 @@ for addon in ${ROOT}/packages/mediacenter/kodi-binary-addons/game.libretro.* ; d
 done
 
 rm -rf "${TMPDIR}"
-

tools/pkgcheck

@@ -52,8 +52,7 @@ process_line() {
     TARGET_CONFIGURE_OPTS CMAKE_GENERATOR_NINJA TARGET_CMAKE_OPTS TARGET_MESON_OPTS \
     HOST_CONFIGURE_OPTS HOST_CMAKE_OPTS HOST_MESON_OPTS \
     INIT_CONFIGURE_OPTS INIT_CMAKE_OPTS INIT_MESON_OPTS \
-             BOOTSTRAP_CONFIGURE_OPTS BOOTSTRAP_CMAKE_OPTS BOOTSTRAP_MESON_OPTS \
+    BOOTSTRAP_CONFIGURE_OPTS BOOTSTRAP_CMAKE_OPTS BOOTSTRAP_MESON_OPTS; do
-             ; do
 
     # After PKG_DIR, treat assigns to var as invalid
     [ "${var}" = "PKG_DIR" ] && assignallowed=N
@@ -83,8 +82,7 @@ init_target_funcs() {
     for f in pre_build \
       pre_configure configure post_configure \
       pre_make make post_make \
-             pre_makeinstall makeinstall post_makeinstall \
+      pre_makeinstall makeinstall post_makeinstall; do
-             ; do
       funcs+=" ${f}_${t}"
     done
   done
@@ -101,8 +99,7 @@ check_func_name() {
     pre_configure \
     ${TARGET_FUNCS} \
     pre_install post_install \
-           addon post_install_addon \
+    addon post_install_addon; do
-           ; do
     [[ ${line} =~ ^${f} ]] && return 0
   done
 

tools/repo-tool

@@ -27,9 +27,9 @@ update_addons_xml() {
 
   echo "[*] updating addons.xml* ..."
   rm -rf .addons
-  pwd=`pwd`
+  pwd=$(pwd)
   find target/addons/$ADDON_VERSION -iname addons.xml | while read line; do
-    localdir=`echo $line | sed s/addons.xml//g`
+    localdir=$(echo $line | sed s/addons.xml//g)
     echo " [*] updating $line..."
     echo '<?xml version="1.0" encoding="UTF-8"?>
 <addons>
@@ -57,7 +57,7 @@ touch_addons_xml() {
     if [ -d "projects/$PROJECT/devices" ]; then
       for DEVICE in $(ls -1 projects/$PROJECT/devices); do
         for archfile in projects/$PROJECT/devices/$DEVICE/linux/linux.*.conf; do
-          ARCH=`echo $archfile | sed -n '$s/\.conf//;$s/.*\.//p'`
+          ARCH=$(echo $archfile | sed -n '$s/\.conf//;$s/.*\.//p')
           if [ ! -d target/addons/$ADDON_VERSION/$DEVICE/$ARCH ]; then
             break
           fi
@@ -68,7 +68,7 @@ touch_addons_xml() {
       done
     else
       for archfile in projects/$PROJECT/linux/linux.*.conf; do
-        ARCH=`echo $archfile | sed -n '$s/\.conf//;$s/.*\.//p'`
+        ARCH=$(echo $archfile | sed -n '$s/\.conf//;$s/.*\.//p')
         if [ ! -d target/addons/$ADDON_VERSION/$PROJECT/$ARCH ]; then
           break
         fi
@@ -99,11 +99,11 @@ build() {
   for PROJECT in $2; do
     if [ -n "$DEVICE" ]; then
       for archfile in projects/$PROJECT/devices/$DEVICE/linux/linux.*.conf; do
-        ARCH=`echo $archfile | sed -n '$s/\.conf//;$s/.*\.//p'`
+        ARCH=$(echo $archfile | sed -n '$s/\.conf//;$s/.*\.//p')
       done
     else
       for archfile in projects/$PROJECT/linux/linux.*.conf; do
-        ARCH=`echo $archfile | sed -n '$s/\.conf//;$s/.*\.//p'`
+        ARCH=$(echo $archfile | sed -n '$s/\.conf//;$s/.*\.//p')
       done
     fi
 
@@ -216,4 +216,3 @@ case $1 in
     exit 0
     ;;
 esac
-

tools/update-scan

@@ -125,15 +125,16 @@ check_for_update() {
 
   # print version output line
   if [ ! -z "${API}" ]; then
-    printf "%s %s %s" "${PKG_NAME}" "${PKG_VERSION}" "${upstream_version}"; printf '\n'
+    printf "%s %s %s" "${PKG_NAME}" "${PKG_VERSION}" "${upstream_version}"
+    printf '\n'
   elif [ "${PKG_VERSION}" != "${upstream_version}" ]; then
-    printf "%-35s | %-40s | %-20s" "${PKG_NAME}" "${PKG_VERSION}" "${upstream_version}"; printf '\n'
+    printf "%-35s | %-40s | %-20s" "${PKG_NAME}" "${PKG_VERSION}" "${upstream_version}"
+    printf '\n'
   else
     PACKAGES_CURRENT+="${PKG_NAME} "
   fi
 }
 
-
 # create list of packages
 if [ -n "${1}" ]; then
   PACKAGE_LIST="$(find packages/ -type d -name ${1})/package.mk"
@@ -141,12 +142,13 @@ if [ -n "${1}" ]; then
     die "Package not found: ${1}"
   fi
 else
-  PACKAGE_LIST="$(find packages/ -type f -name package.mk \
+  PACKAGE_LIST="$(
+    find packages/ -type f -name package.mk \
       ! -path "packages/addons/addon-depends/adafruit-libraries-depends/*" \
       ! -path "packages/emulation/*" \
       ! -path "packages/linux/*" \
-    ! -path "packages/mediacenter/*" \
+      ! -path "packages/mediacenter/*" |
-    | awk '{FS="/" ; $0=$0 ; print $(NF-1)"|"$0}' | sort | cut -d"|" -f2 \
+      awk '{FS="/" ; $0=$0 ; print $(NF-1)"|"$0}' | sort | cut -d"|" -f2
   )"
 fi
 
@@ -156,7 +158,8 @@ if [ -z "${API}" ]; then
 
   # output
   echo -e "\nUpdates found:\n"
-  printf "%-35s | %-40s | %-20s" "Package" "LE git master" "upstream location"; printf '\n'
+  printf "%-35s | %-40s | %-20s" "Package" "LE git master" "upstream location"
+  printf '\n'
   echo -e ''$_{1..140}'\b-'
 
   for check_version in ${PACKAGE_LIST}; do

tools/viewplan

@@ -7,5 +7,5 @@ unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACK
 
 . config/options ""
 
-${SCRIPTS}/pkgjson | ${SCRIPTS}/genbuildplan.py --show-wants --build ${@:-image} --warn-invalid ${GENFLAGS} || \
+${SCRIPTS}/pkgjson | ${SCRIPTS}/genbuildplan.py --show-wants --build ${@:-image} --warn-invalid ${GENFLAGS} ||
   die "FAILURE: Unable to generate plan"