cleanup scripts: tools/

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"