From b216c8d54555b80e7c7e48e2baebd3f66b0caff1 Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Thu, 8 Nov 2018 09:40:43 +0000
Subject: [PATCH] scripts/get: general cleanup

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 scripts/get | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/scripts/get b/scripts/get
index ccdc02bb3a..895732d1ab 100755
--- a/scripts/get
+++ b/scripts/get
@@ -3,32 +3,35 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
-. config/options $1
+. config/options "${1}"
 
-if [ -z "$1" ]; then
-  for i in `find packages/ -type f -name package.mk`; do
-    GET_PKG=`grep ^PKG_NAME= $i | sed -e "s,\",,g" -e "s,PKG_NAME=,,"`
-    $SCRIPTS/get $GET_PKG
+if [ -z "${1}" ]; then
+  for i in $(find "${PACKAGES}/" -type f -name "package.mk"); do
+    GET_PKG=$(grep "^PKG_NAME=" "${i}" | sed -e "s,\",,g" -e "s,PKG_NAME=,,")
+    "${SCRIPTS}"/get "${GET_PKG}"
   done
 fi
 
 # Avoid concurrent processing of the same package
-function lock_source_dir() {
+lock_source_dir() {
   local _isblocked=N
-  exec 99<$SOURCES/$1
+  exec 99<"${SOURCES}/${1}"
   while ! flock --nonblock --exclusive 99; do
-    [ ${_isblocked} = N ] && { echo "Project/Device ${DEVICE:-${PROJECT}} waiting, to avoid concurrent processing of ${1}..."; _isblocked=Y; }
+    if [ ${_isblocked} = N ]; then
+      echo "Project/Device ${DEVICE:-${PROJECT}} waiting, to avoid concurrent processing of ${1}..."
+      _isblocked=Y
+    fi
     sleep 1
   done
 }
 
-if [ -n "$PKG_URL" -a -n "$PKG_SOURCE_NAME" ]; then
-  mkdir -p $SOURCES/$1
+if [ -n "${PKG_URL}" -a -n "${PKG_SOURCE_NAME}" ]; then
+  mkdir -p "${SOURCES}/${1}"
 
-  PACKAGE="$SOURCES/$1/$PKG_SOURCE_NAME"
+  PACKAGE="${SOURCES}/${1}/${PKG_SOURCE_NAME}"
 
-  STAMP_URL="$PACKAGE.url"
-  STAMP_SHA="$PACKAGE.sha256"
+  STAMP_URL="${PACKAGE}.url"
+  STAMP_SHA="${PACKAGE}.sha256"
 
   # determine get handler based on protocol and/or filename
   case "${PKG_URL}" in
@@ -41,16 +44,14 @@ if [ -n "$PKG_URL" -a -n "$PKG_SOURCE_NAME" ]; then
   esac
 
   if ! listcontains "${GET_HANDLER_SUPPORT}" "${get_handler}"; then
-    echo "ERROR: get handler \"${get_handler}\" is not supported, unable to get package $1 - aborting!"
-    exit 1
+    die "ERROR: get handler \"${get_handler}\" is not supported, unable to get package ${1} - aborting!"
   else
     get_handler="${SCRIPTS}/get_${get_handler}"
-    if [ ! -f ${get_handler} ]; then
-      echo "ERROR: get handler \"${get_handler}\" does not exist, unable to get package $1 - aborting!"
-      exit 1
-    else
-      source ${get_handler}
+    if [ ! -f "${get_handler}" ]; then
+      die "ERROR: get handler \"${get_handler}\" does not exist, unable to get package ${1} - aborting!"
     fi
+
+    . "${get_handler}"
   fi
 fi