diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk
index a73fadf632..0c8a88960b 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="a963cc0ee83e2ba6d671b02df5febf7250f626aa"
 PKG_SHA256="2f81a9a6b7b7f46b79faa5b01df0c25fa5f16af80842d74e35b5fbf01ab0c619"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python code to use the ADS1015 and ADS1115 analog to digital converters with a Raspberry Pi."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk
index 76e1371b57..fefd2df3e0 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="dca3d90b5477a304fa130f5cc90ea59e3968ce6f"
 PKG_SHA256="22ec0fc6679cc3e9b5f0aff5cfeef34cbbf13e59aecfb829c2f0dc2d90b5fb8b"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python code to use the ADXL345 triple-axis accelerometer over I2C with a Raspberry Pi."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk
index ef2f9eb563..68f733057b 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="e8521e969afae3321d9789353d7e92ea9a5e9a56"
 PKG_SHA256="e5e140c34e312f6a00c62b1bd47ebe3f1857009b1c202c18c7b092ebb2e1eb9c"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python library for accessing the BMP series pressure and temperature sensors like the BMP085/BMP180 on a Raspberry Pi."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk
index 875a13ba1c..d975b959d4 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="bc75cad284766240424f29dc8e7b84d0caceb72e"
 PKG_SHA256="eae4b446162feb533a469a9dacf6e750250f925561c9f7983a11d340e1dd98d4"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python library for accessing Adafruit character LCDs from a Raspberry Pi."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk
index eed74cebff..e4fedee1a6 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk
@@ -6,18 +6,18 @@ PKG_VERSION="18846deec6a96572b3f2c4a9edfb5bac55b46f5b"
 PKG_SHA256="9125f8f42b4874db257a45184b866e8b424aa67230d2ffbc734b53686da7817f"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python library to read the DHT series of humidity and temperature sensors on a Raspberry Pi."
 PKG_TOOLCHAIN="manual"
 
 pre_make_target() {
-  export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
-  export LDSHARED="$CC -shared"
+  export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr"
+  export LDSHARED="${CC} -shared"
 }
 
 make_target() {
-  case "$PROJECT:$DEVICE" in
+  case "${PROJECT}:${DEVICE}" in
     "RPi:RPi")
       PKG_RPI_VERSION="--force-pi"
       ;;
@@ -28,5 +28,5 @@ make_target() {
       PKG_RPI_VERSION=""
   esac
 
-  python3 setup.py build $PKG_RPI_VERSION --cross-compile
+  python3 setup.py build ${PKG_RPI_VERSION} --cross-compile
 }
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk
index 3ca10bd492..66f433ce69 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="c543d1df9c0a71bafb9f0a1f9dceecd79a920e74"
 PKG_SHA256="d3cb74fd033ebe5aea1786a584d64ef5eb8082ef2bf0a568b01691612cd04e88"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Library to provide a cross-platform GPIO interface on the Raspberry Pi ."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk
index 74d7f88ad5..b2dea34d42 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="e34b9548e86e63747563a94f02b65b2980fdefff"
 PKG_SHA256="244d2625cdaebdc68e299fedde276efa5c9f7c143681c4ee056fb8350a4f7167"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python library for controlling LED backpack displays."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk
index 3317084c5c..11c0ca32d6 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="37d288844515d7bb62a2329982eb033e92dceceb"
 PKG_SHA256="609591f2add15e849d3bba320417c705a50a3ed077632baf20c12c8b740d5331"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python code to use the LSM303 accelerometer & magnetometer with Raspberry Pi."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk
index d6101f6583..6b98f74467 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="e721d26e650c99b0f6d3efd4ec30444e1adf5ccd"
 PKG_SHA256="f5e4c847a87716c16f0209df95c281b5071549644a79a143a77b212f25c464dc"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python code to use the MCP3008 analog to digital converter with a Raspberry Pi."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk
index ce4da41ae7..357869b27f 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="4d028bbcf58b011a8f14c5d95057b7e1dcc1064e"
 PKG_SHA256="6ebbd1f76807b01dc2b723064e52b0c82fc45388265b8ec867e0a42a46a6e926"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python code to use the MCP4725 digital to analog converter with a Raspberry Pi."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk
index 68ef549477..ea54877d60 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="f86db2ca5de379748afd71e379ce2155f47d21e7"
 PKG_SHA256="46e11dcfbfaab5756ddeb6ab31740cf8c7419ec1d32be2519f19882e7d86e426"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python code to use the PCA9685 PWM servo/LED controller with a Raspberry Pi."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk
index 974547bcb6..4ca39414b5 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="6f4976d91c52d70b67b28bba75a429b5328a52c1"
 PKG_SHA256="891a4d077fe6610de6aa4b0dc5b9933a6c7db3492072df60c0383662f28c2ae9"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Pure python access to Linux IO including I2C and SPI."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk
index 0a55c11674..2a7876c849 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="18c400643b39dbf29ab7ff8e74ab0c5c36ef5cf1"
 PKG_SHA256="0238b2c01cfbb2890ae78468d2fc19c815748fc94860a4eb92b649d074476264"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/THP-JOE/Python_SI1145"
-PKG_URL="https://github.com/THP-JOE/Python_SI1145/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/THP-JOE/Python_SI1145/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python library for accessing the SI1145 temperature sensor on a Raspberry Pi"
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk
index 513d4d8807..b8af29e488 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="8819e2d203df49f2843059d981b7347d9881c82b"
 PKG_SHA256="ed1163dee2fe6c0c2065a429e1d93cff7397a309071ff83714c84566739680a2"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="SSD1306 oled driver library for 'monochrome' 128x64 and 128x32 OLEDs."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk
index af3e4ec978..cba9019c39 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="6306f90b4601237a852acef89eeecc1261ce38b3"
 PKG_SHA256="f2c3218551da55d7fdbe2499a6ffa3a0b8ed1709e4402c6b0e0f37b17d4aa81f"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python code to use the TCS34725 color sensor with the Raspberry Pi."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk
index cbe10ab385..d16e9da3ad 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="5c72575b7390fbedfae0b5fb2a881ca9efe9ca22"
 PKG_SHA256="78346836965562720248138203a4af9dc6aa18815bda2a5b7842e3b9af9d1ea8"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python code to use the VCNL4000 & VCNL4010 proximity sensors with the Raspberry Pi."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk
index 43ebf971a8..d26f29e561 100644
--- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk
+++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="d0c190715ffef1b00e5ffa2d7b7560e7f8ed4263"
 PKG_SHA256="6219edb5c1d767ff950f5020bacdfb5ba608b4995eb14d6073fdec2f17f584cb"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"
-PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="Python code to control WS2801 and similar SPI interface addressable RGB LED strips on a Raspberry Pi."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk b/packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk
index ac5b402208..f82675e465 100644
--- a/packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk
@@ -7,6 +7,6 @@ PKG_VERSION="2.38.0"
 PKG_SHA256="cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gnome.org/"
-PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/${PKG_VERSION:0:4}/at-spi2-atk-$PKG_VERSION.tar.xz"
+PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/${PKG_VERSION:0:4}/at-spi2-atk-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain at-spi2-core atk libX11 libxml2"
 PKG_LONGDESC="A GTK+ module that bridges ATK to D-Bus at-spi."
diff --git a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk
index 9d90e91f86..a8466e68c5 100644
--- a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.39.1"
 PKG_SHA256="44d2b042e47d25571581efff673af0a8cd79531babbad2b043784879e15e4228"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gnome.org/"
-PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-$PKG_VERSION.tar.xz"
+PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain atk dbus glib libXtst"
 PKG_LONGDESC="Protocol definitions and daemon for D-Bus at-spi."
 
@@ -16,5 +16,5 @@ PKG_MESON_OPTS_TARGET="-Denable_docs=false \
                        -Ddbus_daemon=/usr/bin/dbus-daemon"
 
 pre_configure_target() {
-  TARGET_LDFLAGS="$LDFLAGS -lXext"
+  TARGET_LDFLAGS="${LDFLAGS} -lXext"
 }
diff --git a/packages/addons/addon-depends/chrome-depends/atk/package.mk b/packages/addons/addon-depends/chrome-depends/atk/package.mk
index 46833214e3..456b6617b4 100644
--- a/packages/addons/addon-depends/chrome-depends/atk/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/atk/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.36.0"
 PKG_SHA256="fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788"
 PKG_LICENSE="GPL"
 PKG_SITE="http://library.gnome.org/devel/atk/"
-PKG_URL="https://ftp.gnome.org/pub/gnome/sources/atk/${PKG_VERSION:0:4}/atk-$PKG_VERSION.tar.xz"
+PKG_URL="https://ftp.gnome.org/pub/gnome/sources/atk/${PKG_VERSION:0:4}/atk-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain glib glib:host"
 PKG_LONGDESC="Provides the set of accessibility interfaces that are implemented by other applications."
 PKG_BUILD_FLAGS="+pic"
diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk
index f7cf5a031e..3dfd366f86 100644
--- a/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk
@@ -9,11 +9,11 @@ PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXcomposite"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
                            --disable-static \
                            --enable-shared"
 
 unpack() {
-  mkdir -p $PKG_BUILD
-  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
+  mkdir -p ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
 }
diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk
index daa3092630..27e67b709f 100644
--- a/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk
@@ -9,11 +9,11 @@ PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXdamage"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
                            --disable-static \
                            --enable-shared"
 
 unpack() {
-  mkdir -p $PKG_BUILD
-  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
+  mkdir -p ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
 }
diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk
index 8168c904bd..ca767e58bb 100644
--- a/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk
@@ -9,11 +9,11 @@ PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXfixes"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
                            --disable-static \
                            --enable-shared"
 
 unpack() {
-  mkdir -p $PKG_BUILD
-  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
+  mkdir -p ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
 }
diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk
index b1b77c3d39..d13753890b 100644
--- a/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk
@@ -9,11 +9,11 @@ PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXi"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
                            --disable-static \
                            --enable-shared"
 
 unpack() {
-  mkdir -p $PKG_BUILD
-  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
+  mkdir -p ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
 }
diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk
index ca5a9a08d4..aff4ca0c3f 100644
--- a/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk
@@ -9,11 +9,11 @@ PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXrender"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
                            --disable-static \
                            --enable-shared"
 
 unpack() {
-  mkdir -p $PKG_BUILD
-  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
+  mkdir -p ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
 }
diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk
index e5cbb8990d..c00c409738 100644
--- a/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk
@@ -9,11 +9,11 @@ PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXtst"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
                            --disable-static \
                            --enable-shared"
 
 unpack() {
-  mkdir -p $PKG_BUILD
-  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
+  mkdir -p ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
 }
diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk
index 2879084f49..56b4afdeeb 100644
--- a/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk
@@ -9,11 +9,11 @@ PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libxcb"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
                            --disable-static \
                            --enable-shared"
 
 unpack() {
-  mkdir -p $PKG_BUILD
-  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.xz -C $PKG_BUILD
+  mkdir -p ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
 }
diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk
index 4f7431c89e..3846dabfda 100644
--- a/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk
@@ -9,11 +9,11 @@ PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libxkbcommon"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_MESON_OPTS_TARGET="$PKG_MESON_OPTS_TARGET \
+PKG_MESON_OPTS_TARGET="${PKG_MESON_OPTS_TARGET} \
                            -Denable-static=false \
                            -Denable-shared=true"
 
 unpack() {
-  mkdir -p $PKG_BUILD
-  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.xz -C $PKG_BUILD
+  mkdir -p ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
 }
diff --git a/packages/addons/addon-depends/chrome-depends/cups/package.mk b/packages/addons/addon-depends/chrome-depends/cups/package.mk
index 29cfcb3f20..7f3e141401 100644
--- a/packages/addons/addon-depends/chrome-depends/cups/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/cups/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.3.3"
 PKG_SHA256="fe298713aad0cbb861de24760f140851122caae9f34d480dbfff0bd9211d961a"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.cups.org"
-PKG_URL="https://github.com/apple/cups/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/apple/cups/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain openssl zlib"
 PKG_LONGDESC="CUPS printing system."
 PKG_BUILD_FLAGS="+pic -sysroot"
@@ -22,9 +22,9 @@ PKG_CONFIGURE_OPTS_TARGET="--libdir=/usr/lib \
 
 pre_configure_target() {
   cd ..
-  rm -rf .$TARGET_NAME
+  rm -rf .${TARGET_NAME}
 }
 
 makeinstall_target() {
-  make BUILDROOT="$INSTALL" install
+  make BUILDROOT="${INSTALL}" install
 }
diff --git a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk
index 04e70a72f7..563a28821f 100644
--- a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.42.2"
 PKG_SHA256="83c66a1cfd591d7680c144d2922c5955d38b4db336d7cd3ee109f7bcf9afef15"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gtk.org/"
-PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-$PKG_VERSION.tar.xz"
+PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain glib libjpeg-turbo libpng jasper shared-mime-info tiff libX11"
 PKG_DEPENDS_CONFIG="shared-mime-info"
 PKG_LONGDESC="GdkPixbuf is a a GNOME library for image loading and manipulation."
diff --git a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk
index a0971d0d33..0d5f8ce001 100644
--- a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="3.24.23"
 PKG_SHA256="5d864d248357a2251545b3387b35942de5f66e4c66013f0962eb5cb6f8dae2b1"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
-PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-$PKG_VERSION.tar.xz"
+PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango"
 PKG_DEPENDS_CONFIG="libXft pango gdk-pixbuf shared-mime-info"
 PKG_LONGDESC="A library for creating graphical user interfaces for the X Window System."
@@ -31,7 +31,7 @@ PKG_MESON_OPTS_TARGET="-Dbroadway_backend=false \
                        -Dx11_backend=true"
 
 pre_configure_target() {
-  # $TOOLCHAIN/bin/glib-compile-resources requires $TOOLCHAIN/lib/libffi.so.6
-  export LD_LIBRARY_PATH="$TOOLCHAIN/lib:$LD_LIBRARY_PATH"
+  # ${TOOLCHAIN}/bin/glib-compile-resources requires ${TOOLCHAIN}/lib/libffi.so.6
+  export LD_LIBRARY_PATH="${TOOLCHAIN}/lib:${LD_LIBRARY_PATH}"
   export GLIB_COMPILE_RESOURCES=glib-compile-resources GLIB_MKENUMS=glib-mkenums GLIB_GENMARSHAL=glib-genmarshal
 }
diff --git a/packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk b/packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk
index 67e7b35986..c5ed2ddb94 100644
--- a/packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk
@@ -22,6 +22,6 @@ PKG_MESON_OPTS_TARGET="-Dcairo=enabled \
                        -Dicu=enabled"
 
 unpack() {
-  mkdir -p $PKG_BUILD
-  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:0:8}/${PKG_NAME:0:8}-$PKG_VERSION.tar.xz -C $PKG_BUILD
+  mkdir -p ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:0:8}/${PKG_NAME:0:8}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
 }
diff --git a/packages/addons/addon-depends/chrome-depends/itstool/package.mk b/packages/addons/addon-depends/chrome-depends/itstool/package.mk
index e3801a0546..c9fcc36a40 100644
--- a/packages/addons/addon-depends/chrome-depends/itstool/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/itstool/package.mk
@@ -6,6 +6,6 @@ PKG_VERSION="2.0.6"
 PKG_SHA256="6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9"
 PKG_LICENSE="GPLv3"
 PKG_SITE="http://itstool.org"
-PKG_URL="http://files.itstool.org/itstool/itstool-$PKG_VERSION.tar.bz2"
+PKG_URL="http://files.itstool.org/itstool/itstool-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_HOST="toolchain libxml2:host"
 PKG_LONGDESC="ITS Tool allows you to translate your XML documents with PO files."
diff --git a/packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk b/packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk
index 9656d720f7..dd3a376d5b 100644
--- a/packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="1.2.3"
 PKG_SHA256="f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8"
 PKG_LICENSE="GPL"
 PKG_SITE="http://xorg.freedesktop.org/"
-PKG_URL="https://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-$PKG_VERSION.tar.bz2"
+PKG_URL="https://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain scrnsaverproto"
 PKG_LONGDESC="X11 Screen Saver extension client library."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk b/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk
index cb00ccd813..d183388b99 100644
--- a/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="1.2.0"
 PKG_SHA256="3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
-PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-$PKG_VERSION.tar.bz2"
+PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libX11 libXfixes libXrender"
 PKG_LONGDESC="X11 Cursor management library.s"
 PKG_BUILD_FLAGS="+pic -sysroot"
diff --git a/packages/addons/addon-depends/chrome-depends/libXft/package.mk b/packages/addons/addon-depends/chrome-depends/libXft/package.mk
index 44726cdf29..15e0380503 100644
--- a/packages/addons/addon-depends/chrome-depends/libXft/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/libXft/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.3.3"
 PKG_SHA256="225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
-PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXft-$PKG_VERSION.tar.bz2"
+PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXft-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain fontconfig freetype libXrender util-macros xorgproto"
 PKG_LONGDESC="X FreeType library."
 PKG_BUILD_FLAGS="+pic -sysroot"
diff --git a/packages/addons/addon-depends/chrome-depends/libxss/package.mk b/packages/addons/addon-depends/chrome-depends/libxss/package.mk
index ce7949263c..133820edc4 100644
--- a/packages/addons/addon-depends/chrome-depends/libxss/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/libxss/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.2.3"
 PKG_SHA256="f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
-PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXScrnSaver-$PKG_VERSION.tar.bz2"
+PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXScrnSaver-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain util-macros libXext scrnsaverproto"
 PKG_LONGDESC="X11 Screen Saver extension library."
 PKG_BUILD_FLAGS="+pic -sysroot"
diff --git a/packages/addons/addon-depends/chrome-depends/pango/package.mk b/packages/addons/addon-depends/chrome-depends/pango/package.mk
index c7784b0044..d7c5416d95 100644
--- a/packages/addons/addon-depends/chrome-depends/pango/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/pango/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="1.48.0"
 PKG_SHA256="391f26f3341c2d7053e0fb26a956bd42360dadd825efe7088b1e9340a65e74e6"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.pango.org/"
-PKG_URL="https://ftp.gnome.org/pub/gnome/sources/pango/${PKG_VERSION:0:4}/pango-$PKG_VERSION.tar.xz"
+PKG_URL="https://ftp.gnome.org/pub/gnome/sources/pango/${PKG_VERSION:0:4}/pango-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain cairo freetype fontconfig fribidi glib harfbuzz libX11 libXft"
 PKG_DEPENDS_CONFIG="libXft cairo"
 PKG_LONGDESC="The Pango library for layout and rendering of internationalized text."
diff --git a/packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk b/packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk
index 22695e56a0..aeafb7ef97 100644
--- a/packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="1.2.2"
 PKG_SHA256="8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65"
 PKG_LICENSE="GPL"
 PKG_SITE="http://xorg.freedesktop.org/"
-PKG_URL="https://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-$PKG_VERSION.tar.bz2"
+PKG_URL="https://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="X11 Screen Saver extension wire protocol."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/chrome-depends/unclutter/package.mk b/packages/addons/addon-depends/chrome-depends/unclutter/package.mk
index c7809603d5..d5df736175 100644
--- a/packages/addons/addon-depends/chrome-depends/unclutter/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/unclutter/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="1.09"
 PKG_SHA256="3a53575fe2a75a34bc9a2b0ad92ee0f8a7dbedc05d8783f191c500060a40a9bd"
 PKG_LICENSE="Public Domain"
 PKG_SITE="https://sourceforge.net/projects/unclutter/"
-PKG_URL="https://sourceforge.net/projects/unclutter/unclutter/source_$PKG_VERSION/unclutter-$PKG_VERSION.tar.gz"
+PKG_URL="https://sourceforge.net/projects/unclutter/unclutter/source_${PKG_VERSION}/unclutter-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libX11"
 PKG_LONGDESC="Unclutter runs in the background of an X11 session and hides the X11 Cursor."
 
 make_target() {
   rm -f Makefile
-  LDFLAGS="$LDFLAGS -lX11" $MAKE unclutter
+  LDFLAGS="${LDFLAGS} -lX11" ${MAKE} unclutter
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  install -m 755 unclutter $INSTALL/usr/bin/
+  mkdir -p ${INSTALL}/usr/bin
+  install -m 755 unclutter ${INSTALL}/usr/bin/
 }
diff --git a/packages/addons/addon-depends/containerd/package.mk b/packages/addons/addon-depends/containerd/package.mk
index 39ec958134..ff0712f4cc 100644
--- a/packages/addons/addon-depends/containerd/package.mk
+++ b/packages/addons/addon-depends/containerd/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="1.3.9"
 PKG_SHA256="9244212589c84b12262769dca6fb985c0c680cb5259c8904b29c511d81fd62d0"
 PKG_LICENSE="APL"
 PKG_SITE="https://containerd.tools/"
-PKG_URL="https://github.com/containerd/containerd/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_LONGDESC="A daemon to control runC, built for performance and density."
 PKG_TOOLCHAIN="manual"
@@ -22,7 +22,7 @@ pre_make_target() {
   export CONTAINERD_VERSION=${PKG_VERSION}
   export CONTAINERD_REVISION=${PKG_GIT_COMMIT}
   export CONTAINERD_PKG=github.com/containerd/containerd
-  export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld $CC"
+  export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld ${CC}"
 
   mkdir -p ${GOPATH}
   if [ -d ${PKG_BUILD}/vendor ]; then
diff --git a/packages/addons/addon-depends/cxxtools/package.mk b/packages/addons/addon-depends/cxxtools/package.mk
index 60c19e6e4d..95f702bbe9 100644
--- a/packages/addons/addon-depends/cxxtools/package.mk
+++ b/packages/addons/addon-depends/cxxtools/package.mk
@@ -17,11 +17,11 @@ PKG_CONFIGURE_OPTS_HOST="--disable-demos --with-atomictype=pthread --disable-uni
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-demos --with-atomictype=pthread --disable-unittest"
 
 post_makeinstall_host() {
-  rm -rf $TOOLCHAIN/bin/cxxtools-config
+  rm -rf ${TOOLCHAIN}/bin/cxxtools-config
 }
 
 post_makeinstall_target() {
-  sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/cxxtools-config
+  sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/cxxtools-config
 
-  rm -rf $INSTALL/usr/bin
+  rm -rf ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk b/packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk
index 881d01556a..c45fb9f144 100644
--- a/packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk
+++ b/packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="28c50c6c3789ea3fcc11b992723d652378c0e925"
 PKG_SHA256="ac766d04bf1a32cf9c74a7ba12070ddf7c4c15bc0a94a0da60d104f2b76f0f9e"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/OpenVisionE2/blindscan-s2/"
-PKG_URL="https://github.com/OpenVisionE2/blindscan-s2/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/OpenVisionE2/blindscan-s2/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="blindscan-s2 is a program to blindscan digital satellite signals"
 PKG_BUILD_FLAGS="-sysroot"
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  make install BIND=$INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  make install BIND=${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk b/packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk
index 8cdb4d8a29..6e08aa304d 100644
--- a/packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk
+++ b/packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk
@@ -13,6 +13,6 @@ PKG_LONGDESC="DVBlast is a simple and powerful MPEG-2/TS demux and streaming app
 PKG_BUILD_FLAGS="-sysroot"
 
 pre_configure_target() {
-  export LDFLAGS="$LDFLAGS -lm"
+  export LDFLAGS="${LDFLAGS} -lm"
   export PREFIX="/usr"
 }
diff --git a/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk b/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk
index 010bbe6d23..3d31bf1071 100644
--- a/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk
+++ b/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="badf61fcdab1177c1162747be06d035a2b671e9b"
 PKG_SHA256="7f0f5d9ca15c5caae3ca249d95a5fc30cececd16f63e00a1404e0d2368ce56fa"
 PKG_LICENSE="GPL"
 PKG_SITE="http://dvbsnoop.sourceforge.net/"
-PKG_URL="https://github.com/Duckbox-Developers/dvbsnoop/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/Duckbox-Developers/dvbsnoop/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="dvbsnoop is a DVB/MPEG stream analyzer program"
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk b/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk
index 42b68c115d..07b5b3a699 100644
--- a/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk
+++ b/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="efc815ccecf5a2b9603027c959a4966fe501f6a5" # 2021-01-06
 PKG_SHA256="b3a6f4a5d2f08d31afa46504dc53644ae21d7dbfa320a216efafcf1e7c44cdba"
 PKG_LICENSE="GPL"
 PKG_SITE="http://mumudvb.net/"
-PKG_URL="https://github.com/braice/MuMuDVB/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/braice/MuMuDVB/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libdvbcsa"
 PKG_LONGDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk b/packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk
index 2b85330403..4129eec4b0 100644
--- a/packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk
+++ b/packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="69ff3584caf9b46f7a551b39b9f9956f8461377c"
 PKG_SHA256="eea8d99d2d5d6403d624acdd9df908a2dd7767dd5469b44e9a281ff863096b32"
 PKG_LICENSE="GPL"
 PKG_SITE="https://bitbucket.org/updatelee/tune-s2"
-PKG_URL="https://bitbucket.org/CrazyCat/szap-s2/get/$PKG_VERSION.tar.gz"
+PKG_URL="https://bitbucket.org/CrazyCat/szap-s2/get/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="szap-s2 is a simple zapping tool for the Linux DVB S2 API"
 PKG_BUILD_FLAGS="-sysroot"
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  make install BIND=$INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  make install BIND=${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk b/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk
index 3f674bc7a6..651a8c42de 100644
--- a/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk
+++ b/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0.7"
 PKG_SHA256="44e4b738a2beed8eb964be3d90b6da48c2d1c672d81fd8db8bbda87bcc433fcb"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/mighty-p/t2scan"
-PKG_URL="https://github.com/mighty-p/t2scan/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/mighty-p/t2scan/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A small channel scan tool which generates DVB-T/T2 channels.conf files."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk b/packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk
index c84bcaad78..3ec09c5fb2 100644
--- a/packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk
+++ b/packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="60cc4aaa70b646d38f2e40251860375283c44816"
 PKG_SHA256="e39069a0f2f0930809647052fe1f8c9a13f05af537013b03a99f09ceb9bfb997"
 PKG_LICENSE="GPL"
 PKG_SITE="https://bitbucket.org/updatelee/tune-s2"
-PKG_URL="https://bitbucket.org/CrazyCat/tune-s2/get/$PKG_VERSION.tar.gz"
+PKG_URL="https://bitbucket.org/CrazyCat/tune-s2/get/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="tune-s2 is a small linux app to be able to tune a dvb devices"
 PKG_BUILD_FLAGS="-sysroot"
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  make install BIND=$INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  make install BIND=${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk b/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk
index 3bd3deda2c..0f611c5db2 100644
--- a/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk
+++ b/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="20170107"
 PKG_SHA256="38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.gen2vdr.de/wirbel/w_scan/index2.html"
-PKG_URL="https://www.gen2vdr.de/wirbel/w_scan/w_scan-$PKG_VERSION.tar.bz2"
+PKG_URL="https://www.gen2vdr.de/wirbel/w_scan/w_scan-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T channels.conf files."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/enca/package.mk b/packages/addons/addon-depends/enca/package.mk
index 9b10033db0..93c2f0d4bc 100644
--- a/packages/addons/addon-depends/enca/package.mk
+++ b/packages/addons/addon-depends/enca/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.19"
 PKG_SHA256="3a487eca40b41021e2e4b7a6440b97d822e6532db5464471f572ecf77295e8b8"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freshmeat.net/projects/enca/"
-PKG_URL="http://dl.cihar.com/enca/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://dl.cihar.com/enca/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Enca detects the encoding of text files, on the basis of knowledge of their language."
 PKG_BUILD_FLAGS="+pic"
@@ -16,7 +16,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__dev_random=yes \
                            ac_cv_file__dev_urandom=no \
                            ac_cv_file__dev_srandom=no \
                            ac_cv_file__dev_arandom=no \
-                           CPPFLAGS="-I$SYSROOT_PREFIX/usr/include" \
+                           CPPFLAGS="-I${SYSROOT_PREFIX}/usr/include" \
                            --disable-shared \
                            --enable-static \
                            --disable-external \
@@ -25,14 +25,14 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__dev_random=yes \
                            --with-gnu-ld"
 
 pre_make_target() {
-  make CC="$HOST_CC" \
-       CPPFLAGS="$HOST_CPPFLAGS" \
-       CFLAGS="$HOST_CFLAGS" \
-       LDFLAGS="$HOST_LDFLAGS" \
+  make CC="${HOST_CC}" \
+       CPPFLAGS="${HOST_CPPFLAGS}" \
+       CFLAGS="${HOST_CFLAGS}" \
+       LDFLAGS="${HOST_LDFLAGS}" \
        -C tools
 }
 
 post_makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
-    cp enca.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
+    cp enca.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig
 }
diff --git a/packages/addons/addon-depends/enet/package.mk b/packages/addons/addon-depends/enet/package.mk
index d7f0fb5015..d5aaf4c0a2 100644
--- a/packages/addons/addon-depends/enet/package.mk
+++ b/packages/addons/addon-depends/enet/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="d9e561938fd9360cdbbd67d78b105ccbe4af0a65" # 10 Jan 2021 # 1.3.17+vi
 PKG_SHA256="ff52ea54edb71662d5933b165c073f079c90ed9adcf98bcb7b2e74d4ddf3dc6b"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/cgutman/enet/"
-PKG_URL="https://github.com/cgutman/enet/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/cgutman/enet/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A network communication layer on top of UDP (User Datagram Protocol)."
 PKG_TOOLCHAIN="autotools"
@@ -14,5 +14,5 @@ PKG_TOOLCHAIN="autotools"
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
 
 post_makeinstall_target() {
-  rm -r $INSTALL
+  rm -r ${INSTALL}
 }
diff --git a/packages/addons/addon-depends/faad2/package.mk b/packages/addons/addon-depends/faad2/package.mk
index 9e754c9ebe..dd51601425 100644
--- a/packages/addons/addon-depends/faad2/package.mk
+++ b/packages/addons/addon-depends/faad2/package.mk
@@ -23,5 +23,5 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
+  rm -rf ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk b/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk
index 1117a25563..a1b1b60edc 100644
--- a/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk
+++ b/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk
@@ -10,13 +10,13 @@ PKG_URL="https://github.com/webmproject/libvpx/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="WebM VP8/VP9 Codec"
 
-if [ "$TARGET_ARCH" = "x86_64" ]; then
+if [ "${TARGET_ARCH}" = "x86_64" ]; then
   PKG_DEPENDS_TARGET+=" nasm:host"
 fi
 
 configure_target() {
 
-  case $ARCH in
+  case ${ARCH} in
     aarch64)
       PKG_TARGET_NAME_LIBVPX="arm64-linux-gcc"
       ;;
@@ -28,10 +28,10 @@ configure_target() {
       ;;
   esac
 
-  $PKG_CONFIGURE_SCRIPT --prefix=/usr \
-                        --extra-cflags="$CFLAGS" \
+  ${PKG_CONFIGURE_SCRIPT} --prefix=/usr \
+                        --extra-cflags="${CFLAGS}" \
                         --as=nasm \
-                        --target=$PKG_TARGET_NAME_LIBVPX \
+                        --target=${PKG_TARGET_NAME_LIBVPX} \
                         --disable-docs \
                         --disable-examples \
                         --disable-shared \
diff --git a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk
index 493f575df9..cc0b42082b 100644
--- a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk
+++ b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk
@@ -6,20 +6,20 @@ PKG_VERSION="6bc7fe4f36ea95db77e6df6d76153dd5a2c770a0"
 PKG_SHA256="d89911373d1de50b5ed1fc8ace9744968e15b69490e1b197d2d4f1b1c456930b"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/x264.html"
-PKG_URL="https://code.videolan.org/videolan/x264/-/archive/master/x264-$PKG_VERSION.tar.gz"
+PKG_URL="https://code.videolan.org/videolan/x264/-/archive/master/x264-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="x264 codec"
 
-if [ "$TARGET_ARCH" = "x86_64" ]; then
+if [ "${TARGET_ARCH}" = "x86_64" ]; then
   PKG_DEPENDS_TARGET+=" nasm:host"
 fi
 
 pre_configure_target() {
-  cd $PKG_BUILD
-  rm -rf .$TARGET_NAME
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}
 
-  if [ "$TARGET_ARCH" = "x86_64" ]; then
-    export AS="$TOOLCHAIN/bin/nasm"
+  if [ "${TARGET_ARCH}" = "x86_64" ]; then
+    export AS="${TOOLCHAIN}/bin/nasm"
   else
     PKG_X264_ASM="--disable-asm"
   fi
@@ -27,13 +27,13 @@ pre_configure_target() {
 
 configure_target() {
   ./configure \
-    --cross-prefix="$TARGET_PREFIX" \
-    --extra-cflags="$CFLAGS" \
-    --extra-ldflags="$LDFLAGS" \
-    --host="$TARGET_NAME" \
+    --cross-prefix="${TARGET_PREFIX}" \
+    --extra-cflags="${CFLAGS}" \
+    --extra-ldflags="${LDFLAGS}" \
+    --host="${TARGET_NAME}" \
     --prefix="/usr" \
-    --sysroot="$SYSROOT_PREFIX" \
-    $PKG_X264_ASM \
+    --sysroot="${SYSROOT_PREFIX}" \
+    ${PKG_X264_ASM} \
     --disable-cli \
     --enable-lto \
     --enable-pic \
diff --git a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
index 3070efbbe4..df8a59b295 100644
--- a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
+++ b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
@@ -13,6 +13,6 @@ PKG_LONGDESC="x265 is a H.265/HEVC video encoder application library"
 PKG_TOOLCHAIN="make"
 
 pre_configure_target() {
-  LDFLAGS="$LDFLAGS -ldl"
+  LDFLAGS+=" -ldl"
   cmake -G "Unix Makefiles" ./source
 }
diff --git a/packages/addons/addon-depends/ffmpegx/package.mk b/packages/addons/addon-depends/ffmpegx/package.mk
index 64af017adc..1ffc6694a6 100644
--- a/packages/addons/addon-depends/ffmpegx/package.mk
+++ b/packages/addons/addon-depends/ffmpegx/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="4.3.1"
 PKG_SHA256="ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
-PKG_URL="https://ffmpeg.org/releases/ffmpeg-$PKG_VERSION.tar.xz"
+PKG_URL="https://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain aom bzip2 gnutls libvorbis opus x264 zlib"
 PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding."
 PKG_BUILD_FLAGS="-gold -sysroot"
@@ -14,31 +14,31 @@ PKG_BUILD_FLAGS="-gold -sysroot"
 # Dependencies
 get_graphicdrivers
 
-if [ "$TARGET_ARCH" = "x86_64" ]; then
+if [ "${TARGET_ARCH}" = "x86_64" ]; then
   PKG_DEPENDS_TARGET+=" nasm:host x265"
 
-  if listcontains "$GRAPHIC_DRIVERS" "(iris|i915|i965)"; then
+  if listcontains "${GRAPHIC_DRIVERS}" "(iris|i915|i965)"; then
     PKG_DEPENDS_TARGET+=" intel-vaapi-driver"
   fi
 fi
 
-if [[ ! $TARGET_ARCH = arm ]] || target_has_feature neon; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvpx"
+if [[ ! ${TARGET_ARCH} = arm ]] || target_has_feature neon; then
+  PKG_DEPENDS_TARGET+=" libvpx"
 fi
 
 # X11 grab for screen recording
-if [ "$DISPLAYSERVER" = "x11" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libxcb libX11"
+if [ "${DISPLAYSERVER}" = "x11" ]; then
+  PKG_DEPENDS_TARGET+=" libxcb libX11"
 fi
 
 pre_configure_target() {
-  cd $PKG_BUILD
-  rm -rf .$TARGET_NAME
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}
 
 # HW encoders
 
   # Generic
-  if [[ "$TARGET_ARCH" = "x86_64" ]]; then
+  if [[ "${TARGET_ARCH}" = "x86_64" ]]; then
     PKG_FFMPEG_HW_ENCODERS_GENERIC="\
     `#Video encoders` \
     --enable-encoder=h264_vaapi \
@@ -89,8 +89,8 @@ pre_configure_target() {
     --enable-encoder=libvorbis"
 
 # X11 grab for screen recording
-  if [ "$DISPLAYSERVER" = "x11" ]; then
-    PKG_FFMPEG_LIBS="$PKG_FFMPEG_LIBS -lX11"
+  if [ "${DISPLAYSERVER}" = "x11" ]; then
+    PKG_FFMPEG_LIBS+=" -lX11"
     PKG_FFMPEG_X11_GRAB="\
     --enable-libxcb \
     --enable-libxcb-shm \
@@ -118,35 +118,35 @@ configure_target() {
     --disable-doc \
     \
     `#Hardware accelerated decoding encoding` \
-    $PKG_FFMPEG_HW_ENCODERS_GENERIC \
+    ${PKG_FFMPEG_HW_ENCODERS_GENERIC} \
     \
     `#General options` \
     --enable-avresample \
     --disable-lzma \
     --disable-alsa \
-    $PKG_FFMPEG_X11_GRAB \
+    ${PKG_FFMPEG_X11_GRAB} \
     \
     `#Toolchain options` \
-    --arch="$TARGET_ARCH" \
-    --cpu="$TARGET_CPU" \
-    --cross-prefix="$TARGET_PREFIX" \
+    --arch="${TARGET_ARCH}" \
+    --cpu="${TARGET_CPU}" \
+    --cross-prefix="${TARGET_PREFIX}" \
     --enable-cross-compile \
-    --sysroot="$SYSROOT_PREFIX" \
-    --sysinclude="$SYSROOT_PREFIX/usr/include" \
+    --sysroot="${SYSROOT_PREFIX}" \
+    --sysinclude="${SYSROOT_PREFIX}/usr/include" \
     --target-os="linux" \
-    --nm="$NM" \
-    --ar="$AR" \
-    --as="$CC" \
-    --cc="$CC" \
-    --ld="$CC" \
-    --pkg-config="$TOOLCHAIN/bin/pkg-config" \
-    --host-cc="$HOST_CC" \
-    --host-cflags="$HOST_CFLAGS" \
-    --host-ldflags="$HOST_LDFLAGS" \
+    --nm="${NM}" \
+    --ar="${AR}" \
+    --as="${CC}" \
+    --cc="${CC}" \
+    --ld="${CC}" \
+    --pkg-config="${TOOLCHAIN}/bin/pkg-config" \
+    --host-cc="${HOST_CC}" \
+    --host-cflags="${HOST_CFLAGS}" \
+    --host-ldflags="${HOST_LDFLAGS}" \
     --host-extralibs="-lm" \
-    --extra-cflags="$CFLAGS" \
-    --extra-ldflags="$LDFLAGS" \
-    --extra-libs="$PKG_FFMPEG_LIBS" \
+    --extra-cflags="${CFLAGS}" \
+    --extra-ldflags="${LDFLAGS}" \
+    --extra-libs="${PKG_FFMPEG_LIBS}" \
     --enable-pic \
     --enable-gnutls \
     --disable-openssl \
diff --git a/packages/addons/addon-depends/game-tools/bchunk/package.mk b/packages/addons/addon-depends/game-tools/bchunk/package.mk
index 72b6aca687..1826275dc5 100644
--- a/packages/addons/addon-depends/game-tools/bchunk/package.mk
+++ b/packages/addons/addon-depends/game-tools/bchunk/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="1.2.2"
 PKG_SHA256="e7d99b5b60ff0b94c540379f6396a670210400124544fb1af985dd3551eabd89"
 PKG_LICENSE="GPL"
 PKG_SITE="http://he.fi/bchunk/"
-PKG_URL="http://he.fi/bchunk/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://he.fi/bchunk/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Tool to convert a CD image in a .bin/.cue format to a set of .iso and .cdr tracks."
 PKG_BUILD_FLAGS="-sysroot"
 
 make_target() {
-  make $PKG_MAKE_OPTS_TARGET CC=$CC LD=$CC
+  make ${PKG_MAKE_OPTS_TARGET} CC=${CC} LD=${CC}
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  cp -p bchunk $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  cp -p bchunk ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/game-tools/ecm-tools/package.mk b/packages/addons/addon-depends/game-tools/ecm-tools/package.mk
index 241eb65de2..7e7be65477 100644
--- a/packages/addons/addon-depends/game-tools/ecm-tools/package.mk
+++ b/packages/addons/addon-depends/game-tools/ecm-tools/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.0.3"
 PKG_SHA256="7b7475789603e64c7ae3ddcb0e95f09640ba37a7f13b29c8e8f2f4087bd872c9"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/alucryd/ecm-tools"
-PKG_URL="https://github.com/alucryd/ecm-tools/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/alucryd/ecm-tools/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Error Code Modeler.s"
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/game-tools/iat/package.mk b/packages/addons/addon-depends/game-tools/iat/package.mk
index 04b1e81fa2..6ceb0399e1 100644
--- a/packages/addons/addon-depends/game-tools/iat/package.mk
+++ b/packages/addons/addon-depends/game-tools/iat/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0.1.7"
 PKG_SHA256="fb72c42f4be18107ec1bff8448bd6fac2a3926a574d4950a4d5120f0012d62ca"
 PKG_LICENSE="GPL"
 PKG_SITE="https://sourceforge.net/projects/iat.berlios/"
-PKG_URL="https://sourceforge.net/projects/iat.berlios/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="https://sourceforge.net/projects/iat.berlios/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Iso9660 Analyzer Tool to detect many structures of image file."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk b/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk
index 12d430232f..db9f3acd14 100644
--- a/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk
+++ b/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.7.1"
 PKG_SHA256="bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sourceforge.net/projects/linuxconsole/"
-PKG_URL="http://prdownloads.sourceforge.net/linuxconsole/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://prdownloads.sourceforge.net/linuxconsole/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Set of utilities for joysticks and serial devices."
 PKG_BUILD_FLAGS="-sysroot"
@@ -14,5 +14,5 @@ PKG_BUILD_FLAGS="-sysroot"
 PKG_MAKE_OPTS_TARGET="SYSTEMD_SUPPORT=0"
 
 makeinstall_target() {
-  make install PREFIX="/usr" DESTDIR="$INSTALL"
+  make install PREFIX="/usr" DESTDIR="${INSTALL}"
 }
diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk
index 787a378e5e..6291529153 100644
--- a/packages/addons/addon-depends/go/package.mk
+++ b/packages/addons/addon-depends/go/package.mk
@@ -22,7 +22,7 @@ configure_host() {
   fi
   export GOARCH=amd64
 
-  if [ ! -d $GOROOT_BOOTSTRAP ]; then
+  if [ ! -d ${GOROOT_BOOTSTRAP} ]; then
     cat <<EOF
 ####################################################################
 # On Fedora 'dnf install golang' will install go to /usr/lib/golang
diff --git a/packages/addons/addon-depends/inadyn/libconfuse/package.mk b/packages/addons/addon-depends/inadyn/libconfuse/package.mk
index 3ff4ba8bbd..cc7ffb1013 100644
--- a/packages/addons/addon-depends/inadyn/libconfuse/package.mk
+++ b/packages/addons/addon-depends/inadyn/libconfuse/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="3.3"
 PKG_SHA256="cb90c06f2dbec971792af576d5b9a382fb3c4ca2b1deea55ea262b403f4e641e"
 PKG_LICENSE="ISC"
 PKG_SITE="https://github.com/libconfuse/libconfuse"
-PKG_URL="https://github.com/libconfuse/libconfuse/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libconfuse/libconfuse/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Small configuration file parser library for C"
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/jasper/package.mk b/packages/addons/addon-depends/jasper/package.mk
index 7d35fb3e7e..d4e99646fa 100644
--- a/packages/addons/addon-depends/jasper/package.mk
+++ b/packages/addons/addon-depends/jasper/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.900.1"
 PKG_SHA256="6e9a959bf4f8cb02f77f42d1b9880b8e85d021ac51f43d8787b5438fd2b7a1c5"
 PKG_LICENSE="OpenSource"
 PKG_SITE="http://www.ece.uvic.ca/~mdadams/jasper/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libjpeg-turbo"
 PKG_LONGDESC="A implementation of the ISO/IEC 15444-1 also known as JPEG-2000 standard for image compression."
 PKG_BUILD_FLAGS="+pic"
@@ -14,5 +14,5 @@ PKG_BUILD_FLAGS="+pic"
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
+  rm -rf ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/jre-depends/jdk-aarch64-zulu/package.mk b/packages/addons/addon-depends/jre-depends/jdk-aarch64-zulu/package.mk
index cf80981bbf..402f108e37 100644
--- a/packages/addons/addon-depends/jre-depends/jdk-aarch64-zulu/package.mk
+++ b/packages/addons/addon-depends/jre-depends/jdk-aarch64-zulu/package.mk
@@ -11,5 +11,5 @@ PKG_LONGDESC="Zulu, the open Java(TM) platform from Azul Systems."
 PKG_TOOLCHAIN="manual"
 
 post_unpack() {
-  rm -f $PKG_BUILD/src.zip
+  rm -f ${PKG_BUILD}/src.zip
 }
diff --git a/packages/addons/addon-depends/jre-depends/jdk-arm-zulu/package.mk b/packages/addons/addon-depends/jre-depends/jdk-arm-zulu/package.mk
index f02a6b6d75..738f9f530b 100644
--- a/packages/addons/addon-depends/jre-depends/jdk-arm-zulu/package.mk
+++ b/packages/addons/addon-depends/jre-depends/jdk-arm-zulu/package.mk
@@ -11,9 +11,9 @@ PKG_LONGDESC="Zulu, the open Java(TM) platform from Azul Systems."
 PKG_TOOLCHAIN="manual"
 
 post_unpack() {
-  rm -f $PKG_BUILD/src.zip
+  rm -f ${PKG_BUILD}/src.zip
 
   # libbluray needs arm/server
-  mv $PKG_BUILD/jre/lib/aarch32    $PKG_BUILD/jre/lib/arm
-  mv $PKG_BUILD/jre/lib/arm/client $PKG_BUILD/jre/lib/arm/server
+  mv ${PKG_BUILD}/jre/lib/aarch32    ${PKG_BUILD}/jre/lib/arm
+  mv ${PKG_BUILD}/jre/lib/arm/client ${PKG_BUILD}/jre/lib/arm/server
 }
diff --git a/packages/addons/addon-depends/jre-depends/jdk-x86_64-zulu/package.mk b/packages/addons/addon-depends/jre-depends/jdk-x86_64-zulu/package.mk
index 9fa2bf9e51..edd47a9590 100644
--- a/packages/addons/addon-depends/jre-depends/jdk-x86_64-zulu/package.mk
+++ b/packages/addons/addon-depends/jre-depends/jdk-x86_64-zulu/package.mk
@@ -11,5 +11,5 @@ PKG_LONGDESC="Zulu, the open Java(TM) platform from Azul Systems."
 PKG_TOOLCHAIN="manual"
 
 post_unpack() {
-  rm -f $PKG_BUILD/src.zip
+  rm -f ${PKG_BUILD}/src.zip
 }
diff --git a/packages/addons/addon-depends/jre-depends/jre-libXinerama/package.mk b/packages/addons/addon-depends/jre-depends/jre-libXinerama/package.mk
index 2d03adf45f..6143389899 100644
--- a/packages/addons/addon-depends/jre-depends/jre-libXinerama/package.mk
+++ b/packages/addons/addon-depends/jre-depends/jre-libXinerama/package.mk
@@ -12,6 +12,6 @@ PKG_BUILD_FLAGS="-sysroot"
 PKG_CONFIGURE_OPTS_TARGET+=" --disable-static --enable-shared"
 
 unpack() {
-  mkdir -p $PKG_BUILD
-  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:4}/${PKG_NAME:4}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
+  mkdir -p ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:4}/${PKG_NAME:4}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
 }
diff --git a/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk b/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk
index bd0563131f..5a256b88fd 100644
--- a/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk
+++ b/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk
@@ -12,8 +12,8 @@ PKG_PATCH_DIRS+=" $(get_pkg_directory libbluray)/patches"
 PKG_BUILD_FLAGS="-sysroot"
 
 unpack() {
-  mkdir -p $PKG_BUILD
-  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:4}/${PKG_NAME:4}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
+  mkdir -p ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:4}/${PKG_NAME:4}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
 }
 
 pre_configure_target() {
diff --git a/packages/addons/addon-depends/lcdd-depends/libugpio/package.mk b/packages/addons/addon-depends/lcdd-depends/libugpio/package.mk
index a508707eef..f12b2c4be0 100644
--- a/packages/addons/addon-depends/lcdd-depends/libugpio/package.mk
+++ b/packages/addons/addon-depends/lcdd-depends/libugpio/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0.0.7"
 PKG_SHA256="4f486b36d87da070cb3afbe8d077081b27f670cb4cb67698d1b79740b6e604b3"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="https://github.com/mhei/libugpio"
-PKG_URL="https://github.com/mhei/$PKG_NAME/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/mhei/${PKG_NAME}/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain linux:host"
 PKG_LONGDESC="A software library to ease the use of linux kernel's sysfs gpio interface from C programs and/or other libraries."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk b/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk
index 089512f710..9cb0f47831 100644
--- a/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk
+++ b/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk
@@ -7,33 +7,33 @@ PKG_VERSION="2.02"
 PKG_SHA256="447b74007dc157b0378044245649850b26432b9185b6540ff681fcb0765c4d8b"
 PKG_LICENSE="GPL"
 PKG_SITE="http://serdisplib.sourceforge.net/"
-PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="${SOURCEFORGE_SRC}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libusb-compat"
 PKG_LONGDESC="Library to drive serial/parallel/usb displays with built-in controllers."
 
-PKG_CONFIGURE_OPTS_TARGET="--prefix=$SYSROOT_PREFIX/usr \
-                           --bindir=$SYSROOT_PREFIX/usr/bin \
+PKG_CONFIGURE_OPTS_TARGET="--prefix=${SYSROOT_PREFIX}/usr \
+                           --bindir=${SYSROOT_PREFIX}/usr/bin \
                            --enable-libusb \
                            --disable-libSDL \
                            --with-drivers=all"
 
 pre_configure_target() {
   # serdisplib fails to build in subdirs
-  cd $PKG_BUILD
-    rmdir .$TARGET_NAME
+  cd ${PKG_BUILD}
+    rmdir .${TARGET_NAME}
 
   # use libusb-config from sysroot
-  export ac_cv_path_LIBUSB_CONFIG=$SYSROOT_PREFIX/usr/bin/libusb-config
+  export ac_cv_path_LIBUSB_CONFIG=${SYSROOT_PREFIX}/usr/bin/libusb-config
 }
 
 makeinstall_target() {
   # copy necessary libs and headers to build serdisplib support
   # into the driver glcd from lcdproc
-  mkdir -p $SYSROOT_PREFIX/usr/include/serdisplib
-  cp include/serdisplib/*.h $SYSROOT_PREFIX/usr/include/serdisplib
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-  cp lib/libserdisp.so* $SYSROOT_PREFIX/usr/lib
+  mkdir -p ${SYSROOT_PREFIX}/usr/include/serdisplib
+  cp include/serdisplib/*.h ${SYSROOT_PREFIX}/usr/include/serdisplib
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib
+  cp lib/libserdisp.so* ${SYSROOT_PREFIX}/usr/lib
 
-  mkdir -p $INSTALL/usr/lib
-  cp lib/libserdisp.so* $INSTALL/usr/lib
+  mkdir -p ${INSTALL}/usr/lib
+  cp lib/libserdisp.so* ${INSTALL}/usr/lib
 }
diff --git a/packages/addons/addon-depends/libconfig/package.mk b/packages/addons/addon-depends/libconfig/package.mk
index 0381f1f3f5..ddb3e73ea5 100644
--- a/packages/addons/addon-depends/libconfig/package.mk
+++ b/packages/addons/addon-depends/libconfig/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.7.2"
 PKG_SHA256="f67ac44099916ae260a6c9e290a90809e7d782d96cdd462cac656ebc5b685726"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://github.com/hyperrealm/libconfig"
-PKG_URL="https://github.com/hyperrealm/libconfig/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/hyperrealm/libconfig/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A C/C++ configuration file library."
 PKG_TOOLCHAIN="autotools"
@@ -14,9 +14,9 @@ PKG_TOOLCHAIN="autotools"
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared \
                            --disable-examples \
-                           --with-sysroot=$SYSROOT_PREFIX"
+                           --with-sysroot=${SYSROOT_PREFIX}"
 
 pre_configure_target() {
   cd ..
-  rm -rf .$TARGET_NAME
+  rm -rf .${TARGET_NAME}
 }
diff --git a/packages/addons/addon-depends/libdvbcsa/package.mk b/packages/addons/addon-depends/libdvbcsa/package.mk
index 0c38dd0a2d..85a7411850 100644
--- a/packages/addons/addon-depends/libdvbcsa/package.mk
+++ b/packages/addons/addon-depends/libdvbcsa/package.mk
@@ -7,23 +7,23 @@ PKG_VERSION="2a1e61e569a621c55c2426f235f42c2398b7f18f" # 2018-01-29
 PKG_SHA256="0cca50576222475afd6945fc883ee19870656a73353eb0b219078671abaf3fbb"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://www.videolan.org/developers/libdvbcsa.html"
-PKG_URL="https://github.com/glenvt18/libdvbcsa/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/glenvt18/libdvbcsa/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A implementation of DVB/CSA, with encryption and decryption capabilities."
 PKG_TOOLCHAIN="autotools"
 # libdvbcsa is a bit faster without LTO, and tests will fail with gcc-5.x
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static --with-sysroot=$SYSROOT_PREFIX"
+PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static --with-sysroot=${SYSROOT_PREFIX}"
 
 if target_has_feature neon; then
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-neon"
-elif [ "$TARGET_ARCH" = x86_64  ]; then
+  PKG_CONFIGURE_OPTS_TARGET+=" --enable-neon"
+elif [ "${TARGET_ARCH}" = x86_64  ]; then
   if target_has_feature ssse3; then
-    PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-ssse3"
+    PKG_CONFIGURE_OPTS_TARGET+=" --enable-ssse3"
   elif target_has_feature sse2; then
-    PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-sse2"
+    PKG_CONFIGURE_OPTS_TARGET+=" --enable-sse2"
   else
-    PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-uint64"
+    PKG_CONFIGURE_OPTS_TARGET+=" --enable-uint64"
   fi
 fi
diff --git a/packages/addons/addon-depends/libexif/package.mk b/packages/addons/addon-depends/libexif/package.mk
index c878dbce65..7192769d5c 100644
--- a/packages/addons/addon-depends/libexif/package.mk
+++ b/packages/addons/addon-depends/libexif/package.mk
@@ -6,6 +6,6 @@ PKG_VERSION="0.6.22"
 PKG_SHA256="5048f1c8fc509cc636c2f97f4b40c293338b6041a5652082d5ee2cf54b530c56"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://libexif.github.io"
-PKG_URL="https://github.com/libexif/libexif/releases/download/libexif-${PKG_VERSION//./_}-release/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/libexif/libexif/releases/download/libexif-${PKG_VERSION//./_}-release/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A library to parse an EXIF file and read the data from those tags."
diff --git a/packages/addons/addon-depends/libiconv/package.mk b/packages/addons/addon-depends/libiconv/package.mk
index 3be56e6d38..3bf7ad81e2 100644
--- a/packages/addons/addon-depends/libiconv/package.mk
+++ b/packages/addons/addon-depends/libiconv/package.mk
@@ -6,13 +6,13 @@ PKG_VERSION="1.16"
 PKG_SHA256="e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04"
 PKG_LICENSE="GPL"
 PKG_SITE="https://savannah.gnu.org/projects/libiconv/"
-PKG_URL="http://ftp.gnu.org/pub/gnu/libiconv/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://ftp.gnu.org/pub/gnu/libiconv/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A tool that converts from one character encoding to another through Unicode conversion."
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_TARGET="--host=$TARGET_NAME \
-            --build=$HOST_NAME \
+PKG_CONFIGURE_OPTS_TARGET="--host=${TARGET_NAME} \
+            --build=${HOST_NAME} \
             --prefix=/usr \
             --includedir=/usr/include/iconv \
             --libdir=/usr/lib/iconv \
diff --git a/packages/addons/addon-depends/libid3tag/package.mk b/packages/addons/addon-depends/libid3tag/package.mk
index f52ef80b54..aa1a8bf9b9 100644
--- a/packages/addons/addon-depends/libid3tag/package.mk
+++ b/packages/addons/addon-depends/libid3tag/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="0.15.1b"
 PKG_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.underbit.com/products/mad/"
-PKG_URL="ftp://ftp.mars.org/pub/mpeg/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="ftp://ftp.mars.org/pub/mpeg/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain zlib"
 PKG_LONGDESC="A library for id3 tagging."
 
@@ -15,5 +15,5 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared"
 
 post_makeinstall_target(){
- cp $PKG_BUILD/id3tag.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+ cp ${PKG_BUILD}/id3tag.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig
 }
diff --git a/packages/addons/addon-depends/libmad/package.mk b/packages/addons/addon-depends/libmad/package.mk
index 1ef3ae3613..7d8c8d6456 100644
--- a/packages/addons/addon-depends/libmad/package.mk
+++ b/packages/addons/addon-depends/libmad/package.mk
@@ -6,20 +6,20 @@ PKG_VERSION="0.15.1b"
 PKG_SHA256="bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.mars.org/home/rob/proj/mpeg/"
-PKG_URL="$SOURCEFORGE_SRC/mad/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="${SOURCEFORGE_SRC}/mad/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A high-quality MPEG audio decoder."
 PKG_TOOLCHAIN="autotools"
 
 # package specific configure options
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
-if [ "$TARGET_ARCH" = "x86_64" ] ; then
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-accuracy --enable-fpm=64bit"
+if [ "${TARGET_ARCH}" = "x86_64" ]; then
+  PKG_CONFIGURE_OPTS_TARGET+=" --enable-accuracy --enable-fpm=64bit"
 fi
 
 post_makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
-  cat > $SYSROOT_PREFIX/usr/lib/pkgconfig/mad.pc << "EOF"
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
+  cat > ${SYSROOT_PREFIX}/usr/lib/pkgconfig/mad.pc << "EOF"
 prefix=/usr
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
diff --git a/packages/addons/addon-depends/libnetwork/package.mk b/packages/addons/addon-depends/libnetwork/package.mk
index 1712f175ba..29b404fce9 100644
--- a/packages/addons/addon-depends/libnetwork/package.mk
+++ b/packages/addons/addon-depends/libnetwork/package.mk
@@ -16,17 +16,17 @@ pre_make_target() {
   go_configure
 
   export CGO_ENABLED=0
-  export LDFLAGS="-extld $CC"
+  export LDFLAGS="-extld ${CC}"
 
   mkdir -p ${GOPATH}
-  if [ -d $PKG_BUILD/vendor ]; then
-    mv $PKG_BUILD/vendor ${GOPATH}/src
+  if [ -d ${PKG_BUILD}/vendor ]; then
+    mv ${PKG_BUILD}/vendor ${GOPATH}/src
   fi
 
-  ln -fs $PKG_BUILD ${GOPATH}/src/github.com/docker/libnetwork
+  ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/docker/libnetwork
 }
 
 make_target() {
   mkdir -p bin
-  $GOLANG build -v -o bin/docker-proxy -a -ldflags "$LDFLAGS" ./cmd/proxy
+  ${GOLANG} build -v -o bin/docker-proxy -a -ldflags "${LDFLAGS}" ./cmd/proxy
 }
diff --git a/packages/addons/addon-depends/librespot-depends/rust/package.mk b/packages/addons/addon-depends/librespot-depends/rust/package.mk
index efad5540dc..fde7e7d301 100644
--- a/packages/addons/addon-depends/librespot-depends/rust/package.mk
+++ b/packages/addons/addon-depends/librespot-depends/rust/package.mk
@@ -10,10 +10,10 @@ PKG_LONGDESC="A systems programming language that prevents segfaults, and guaran
 PKG_TOOLCHAIN="manual"
 
 make_target() {
-  export CARGO_HOME="$PKG_BUILD/cargo"
-  export RUSTUP_HOME="$CARGO_HOME"
-  export PATH="$CARGO_HOME/bin:$PATH"
-  case "$TARGET_ARCH" in
+  export CARGO_HOME="${PKG_BUILD}/cargo"
+  export RUSTUP_HOME="${CARGO_HOME}"
+  export PATH="${CARGO_HOME}/bin:${PATH}"
+  case "${TARGET_ARCH}" in
     aarch64)
       RUST_TARGET_TRIPLE="aarch64-unknown-linux-gnu"
       ;;
@@ -25,28 +25,28 @@ make_target() {
       ;;
   esac
   "$(get_build_dir rustup.rs)/rustup-init.sh" \
-    --default-toolchain "$PKG_VERSION" \
+    --default-toolchain "${PKG_VERSION}" \
     --no-modify-path \
     --profile minimal \
-    --target "$RUST_TARGET_TRIPLE" \
+    --target "${RUST_TARGET_TRIPLE}" \
     -y
 
-  cat <<EOF >"$CARGO_HOME/config"
+  cat <<EOF >"${CARGO_HOME}/config"
 [build]
-target = "$RUST_TARGET_TRIPLE"
+target = "${RUST_TARGET_TRIPLE}"
 
-[target.$RUST_TARGET_TRIPLE]
-ar = "$AR"
-linker = "$CC"
+[target.${RUST_TARGET_TRIPLE}]
+ar = "${AR}"
+linker = "${CC}"
 EOF
 
-  cat <<EOF >"$CARGO_HOME/env"
-export CARGO_HOME="$CARGO_HOME"
-export CARGO_TARGET_DIR="\$PKG_BUILD/.\$TARGET_NAME"
-export PATH="$CARGO_HOME/bin:$PATH"
+  cat <<EOF >"${CARGO_HOME}/env"
+export CARGO_HOME="${CARGO_HOME}"
+export CARGO_TARGET_DIR="\${PKG_BUILD}/.\${TARGET_NAME}"
+export PATH="${CARGO_HOME}/bin:${PATH}"
 export PKG_CONFIG_ALLOW_CROSS="1"
-export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR"
-export RUSTUP_HOME="$CARGO_HOME"
+export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}"
+export RUSTUP_HOME="${CARGO_HOME}"
 unset CFLAGS
 EOF
 }
diff --git a/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk b/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk
index bfffe620fe..544068b761 100644
--- a/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk
+++ b/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.23.1"
 PKG_SHA256="0203231bfe405ee1c7d5e7e1c013b9b8a2dc87fbd8474e77f500331d8c26365f"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"
-PKG_URL="https://github.com/rust-lang-nursery/rustup.rs/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/rust-lang-nursery/rustup.rs/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="The Rust toolchain installer."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/libvncserver/package.mk b/packages/addons/addon-depends/libvncserver/package.mk
index 2139e2e630..bc88df8fb6 100644
--- a/packages/addons/addon-depends/libvncserver/package.mk
+++ b/packages/addons/addon-depends/libvncserver/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0.9.13"
 PKG_SHA256="0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libvnc.github.io/"
-PKG_URL="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libjpeg-turbo libpng openssl systemd"
 PKG_LONGDESC="A C library that allow you to easily implement VNC server or client functionality."
 
diff --git a/packages/addons/addon-depends/libzip/package.mk b/packages/addons/addon-depends/libzip/package.mk
index d094826183..e7c16e7ee7 100644
--- a/packages/addons/addon-depends/libzip/package.mk
+++ b/packages/addons/addon-depends/libzip/package.mk
@@ -23,5 +23,5 @@ PKG_CMAKE_OPTS_TARGET="-DENABLE_COMMONCRYPTO=OFF \
                        -DBUILD_SHARED_LIBS=OFF"
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/lib
+  rm -rf ${INSTALL}/usr/lib
 }
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk
index 24c610cc65..5c2fb274e2 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk
@@ -17,8 +17,8 @@ configure_target() {
   cd Project/GNU/Library
   do_autoreconf
   ./configure \
-        --host=$TARGET_NAME \
-        --build=$HOST_NAME \
+        --host=${TARGET_NAME} \
+        --build=${HOST_NAME} \
         --enable-static \
         --disable-shared \
         --prefix=/usr \
@@ -30,12 +30,12 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/include/MediaInfo $INSTALL/usr/lib/pkgconfig
-  cp -aP ../../../Source/MediaInfo/*.h $INSTALL/usr/include/MediaInfo
-  for i in Archive Audio Duplicate Export Image Multiple Reader Tag Text Video ; do
-    mkdir -p $INSTALL/usr/include/MediaInfo/$i/
-    cp -aP ../../../Source/MediaInfo/$i/*.h $INSTALL/usr/include/MediaInfo/$i/
+  mkdir -p ${INSTALL}/usr/include/MediaInfo ${INSTALL}/usr/lib/pkgconfig
+  cp -aP ../../../Source/MediaInfo/*.h ${INSTALL}/usr/include/MediaInfo
+  for i in Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+    mkdir -p ${INSTALL}/usr/include/MediaInfo/${i}/
+    cp -aP ../../../Source/MediaInfo/${i}/*.h ${INSTALL}/usr/include/MediaInfo/${i}/
   done
-  cp -P .libs/* $INSTALL/usr/lib
-  cp -P libmediainfo.pc $INSTALL/usr/lib/pkgconfig
+  cp -P .libs/* ${INSTALL}/usr/lib
+  cp -P libmediainfo.pc ${INSTALL}/usr/lib/pkgconfig
 }
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk
index 5963cfdc2e..bb893e7b5b 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk
@@ -16,8 +16,8 @@ configure_target() {
   cd Project/GNU/Library
   do_autoreconf
   ./configure \
-        --host=$TARGET_NAME \
-        --build=$HOST_NAME \
+        --host=${TARGET_NAME} \
+        --build=${HOST_NAME} \
         --enable-static \
         --disable-shared \
         --prefix=/usr
@@ -28,12 +28,12 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/include/ZenLib $INSTALL/usr/lib/pkgconfig
-  cp -aP ../../../Source/ZenLib/*.h $INSTALL/usr/include/ZenLib
-  for i in HTTP_Client Format/Html Format/Http ; do
-    mkdir -p $INSTALL/usr/include/ZenLib/$i/
-    cp -aP ../../../Source/ZenLib/$i/*.h $INSTALL/usr/include/ZenLib/$i/
+  mkdir -p ${INSTALL}/usr/include/ZenLib ${INSTALL}/usr/lib/pkgconfig
+  cp -aP ../../../Source/ZenLib/*.h ${INSTALL}/usr/include/ZenLib
+  for i in HTTP_Client Format/Html Format/Http; do
+    mkdir -p ${INSTALL}/usr/include/ZenLib/${i}/
+    cp -aP ../../../Source/ZenLib/${i}/*.h ${INSTALL}/usr/include/ZenLib/${i}/
   done
-  cp -P .libs/* $INSTALL/usr/lib
-  cp -P libzen.pc $INSTALL/usr/lib/pkgconfig
+  cp -P .libs/* ${INSTALL}/usr/lib
+  cp -P libzen.pc ${INSTALL}/usr/lib/pkgconfig
 }
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk
index c9a756db92..dbba8aa373 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk
@@ -17,8 +17,8 @@ configure_target() {
   cd Project/GNU/CLI
   do_autoreconf
   ./configure \
-        --host=$TARGET_NAME \
-        --build=$HOST_NAME \
+        --host=${TARGET_NAME} \
+        --build=${HOST_NAME} \
         --prefix=/usr
 }
 
@@ -27,5 +27,5 @@ make_target() {
 }
 
 makeinstall_target() {
-  make install DESTDIR=$INSTALL
+  make install DESTDIR=${INSTALL}
 }
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk
index 5206c1df6e..9053cdfed5 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
-PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libX11 mesa glu glew"
 PKG_LONGDESC="Mesa 3D demos - installed are the well known glxinfo and glxgears."
 PKG_TOOLCHAIN="autotools"
@@ -16,8 +16,8 @@ PKG_BUILD_FLAGS="-sysroot"
 PKG_CONFIGURE_OPTS_TARGET="--without-glut"
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-    cp -P src/xdemos/glxdemo $INSTALL/usr/bin
-    cp -P src/xdemos/glxgears $INSTALL/usr/bin
-    cp -P src/xdemos/glxinfo $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+    cp -P src/xdemos/glxdemo ${INSTALL}/usr/bin
+    cp -P src/xdemos/glxgears ${INSTALL}/usr/bin
+    cp -P src/xdemos/glxinfo ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk
index 19ab720072..994ce799ec 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.26.4"
 PKG_SHA256="081991540df7a666b29049ad870f293cfa28863b36488ab4d58ceaa7b5846454"
 PKG_LICENSE="LGPLv2"
 PKG_SITE="http://www.mpg123.org/"
-PKG_URL="http://downloads.sourceforge.net/sourceforge/mpg123/mpg123-$PKG_VERSION.tar.bz2"
+PKG_URL="http://downloads.sourceforge.net/sourceforge/mpg123/mpg123-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain alsa-lib"
 PKG_LONGDESC="A console based real time MPEG Audio Player for Layer 1, 2 and 3."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk
index ce6ea9488d..b904236382 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0.33.0"
 PKG_SHA256="f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mpv.io/"
-PKG_URL="https://github.com/mpv-player/mpv/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/mpv-player/mpv/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain waf:host alsa ffmpeg libass libdrm"
 PKG_LONGDESC="A media player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types."
 PKG_TOOLCHAIN="manual"
@@ -29,29 +29,29 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
                            --enable-gbm \
                            --enable-egl-drm"
 
-if [ "$OPENGLES_SUPPORT" = "yes" ]; then
-  PKG_DEPENDS_TARGET+=" $OPENGLES"
+if [ "${OPENGLES_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
 fi
 
-if [ "$OPENGL_SUPPORT" = "yes" ]; then
-  PKG_DEPENDS_TARGET+=" $OPENGL"
+if [ "${OPENGL_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGL}"
 fi
 
-if [ "$VAAPI_SUPPORT" = "yes" ]; then
+if [ "${VAAPI_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" libva"
   PKG_CONFIGURE_OPTS_TARGET+=" --enable-vaapi --enable-vaapi-drm"
 else
   PKG_CONFIGURE_OPTS_TARGET+=" --disable-vaapi"
 fi
 
-if [ "$PULSEAUDIO_SUPPORT" = "yes" ]; then
+if [ "${PULSEAUDIO_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" pulseaudio"
   PKG_CONFIGURE_OPTS_TARGET+=" --enable-pulse"
 else
   PKG_CONFIGURE_OPTS_TARGET+=" --disable-pulse"
 fi
 
-if [ "$KODI_BLURAY_SUPPORT" = "yes" ]; then
+if [ "${KODI_BLURAY_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" libbluray"
   PKG_CONFIGURE_OPTS_TARGET+=" --enable-libbluray"
 else
@@ -59,7 +59,7 @@ else
 fi
 
 configure_target() {
-  waf configure $PKG_CONFIGURE_OPTS_TARGET
+  waf configure ${PKG_CONFIGURE_OPTS_TARGET}
 }
 
 make_target() {
@@ -67,6 +67,6 @@ make_target() {
 }
 
 makeinstall_target() {
-  waf install --destdir=$INSTALL
-  rm -r $INSTALL/usr/share
+  waf install --destdir=${INSTALL}
+  rm -r ${INSTALL}/usr/share
 }
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk
index d543113f4f..d50e3ede8c 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk
@@ -12,10 +12,10 @@ PKG_LONGDESC="A free and open source MPEG2 transport stream data generator and p
 PKG_BUILD_FLAGS="-sysroot"
 
 pre_configure_target() {
-  PKG_MAKE_OPTS_TARGET="CC=$CC"
+  PKG_MAKE_OPTS_TARGET="CC=${CC}"
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  make install DESTDIR=$INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  make install DESTDIR=${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk
index 99062e0eb5..801a8a3de8 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="78fef68d39704753cb7101231a8d3bc29f2aa2c9" # 2021-01-03 # 1.9.8.1315
 PKG_SHA256="e4dce15d6f8968150d9535cb4e95017b4097d2282a1da1c87b3c7651dbca40c3"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/ralph-irving/squeezelite"
-PKG_URL="https://github.com/ralph-irving/squeezelite/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/ralph-irving/squeezelite/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain faad2 ffmpeg flac libmad libvorbis mpg123 soxr libogg"
 PKG_DEPENDS_CONFIG="mpg123"
 PKG_LONGDESC="A client for the Logitech Media Server."
@@ -15,11 +15,11 @@ PKG_BUILD_FLAGS="-sysroot"
 make_target() {
   make \
     OPTS="-DDSD -DFFMPEG -DRESAMPLE -DVISEXPORT -DLINKALL" \
-    CFLAGS="$CFLAGS $(pkg-config --cflags libmpg123 vorbisfile vorbis ogg)" \
-    LDFLAGS="$LDFLAGS $(pkg-config --libs libmpg123 vorbisfile vorbis ogg)"
+    CFLAGS="${CFLAGS} $(pkg-config --cflags libmpg123 vorbisfile vorbis ogg)" \
+    LDFLAGS+=" $(pkg-config --libs libmpg123 vorbisfile vorbis ogg)"
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  cp -p squeezelite $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  cp -p squeezelite ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/tsdecrypt/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/tsdecrypt/package.mk
index 7818509905..db5e0a0689 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/tsdecrypt/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/tsdecrypt/package.mk
@@ -15,9 +15,9 @@ PKG_BUILD_FLAGS="-sysroot"
 PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr"
 
 make_target() {
-  make CC=$CC LINK="$LD -o"
+  make CC=${CC} LINK="${LD} -o"
 }
 
 post_make_target() {
-  make strip STRIP=$STRIP
+  make strip STRIP=${STRIP}
 }
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk
index 01e1463775..aeca8cbc92 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk
@@ -7,12 +7,12 @@ PKG_VERSION="db1f79f409818fa0476ecf8593079a7ca3dbafd2"
 PKG_SHA256="f204229016c9deafcc75fe602c390339878312126134edbfcebf239e093dc4ff"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/kynesim/tstools"
-PKG_URL="https://github.com/kynesim/tstools/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/kynesim/tstools/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="This is a set of cross-platform command line tools for working with MPEG data."
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_MAKE_OPTS_TARGET="CROSS_COMPILE=$TARGET_PREFIX prefix=/usr"
+PKG_MAKE_OPTS_TARGET="CROSS_COMPILE=${TARGET_PREFIX} prefix=/usr"
 PKG_MAKEINSTALL_OPTS_TARGET="${PKG_MAKE_OPTS_TARGET}"
 
 pre_make_target() {
diff --git a/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk b/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk
index 9b7cad0cd0..6e0c785f7f 100644
--- a/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0.6.3"
 PKG_SHA256="c1a552b6ff48ea3e4e10110a7c188861abc4750befc67c6caaba8eb3ecf67f46"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gropp.org/?id=projects&sub=bwm-ng"
-PKG_URL="https://github.com/vgropp/bwm-ng/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/vgropp/bwm-ng/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses libstatgrab"
 PKG_LONGDESC="A small and simple console-based live network and disk io bandwidth monitor."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk
index 10370c344f..da07b3d0b9 100644
--- a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk
@@ -29,5 +29,5 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
+  rm -rf ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/network-tools-depends/depends/libstatgrab/package.mk b/packages/addons/addon-depends/network-tools-depends/depends/libstatgrab/package.mk
index a6086cf64d..2879514aae 100644
--- a/packages/addons/addon-depends/network-tools-depends/depends/libstatgrab/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/depends/libstatgrab/package.mk
@@ -5,7 +5,7 @@ PKG_NAME="libstatgrab"
 PKG_VERSION="0.92"
 PKG_SHA256="5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012d5a196"
 PKG_SITE="http://www.i-scream.org/libstatgrab/"
-PKG_URL="http://ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-$PKG_VERSION.tar.gz"
+PKG_URL="http://ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION=libs
 PKG_LONGDESC="A library that provides cross platform access to statistics about the system on which it's run."
diff --git a/packages/addons/addon-depends/network-tools-depends/iftop/package.mk b/packages/addons/addon-depends/network-tools-depends/iftop/package.mk
index 002a901a08..27e52f51ac 100644
--- a/packages/addons/addon-depends/network-tools-depends/iftop/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/iftop/package.mk
@@ -6,15 +6,15 @@ PKG_VERSION="77901c8c53e01359d83b8090aacfe62214658183"
 PKG_SHA256="f2728741f1bd2099d325271b4b2564a696dbce7c23401360ac6c9841cbda1108"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.ex-parrot.com/pdw/iftop/"
-PKG_URL="https://code.blinkace.com/pdw/iftop/-/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://code.blinkace.com/pdw/iftop/-/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses libpcap libnl"
 PKG_LONGDESC="A tool to display bandwidth usage on an interface."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="-sysroot"
 
 pre_build_target() {
-  mkdir -p $PKG_BUILD/.$TARGET_NAME
-  cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
+  mkdir -p ${PKG_BUILD}/.${TARGET_NAME}
+  cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME}
 }
 
 pre_configure_target() {
diff --git a/packages/addons/addon-depends/network-tools-depends/iperf/package.mk b/packages/addons/addon-depends/network-tools-depends/iperf/package.mk
index 7b2a01d0cc..14f809aa72 100644
--- a/packages/addons/addon-depends/network-tools-depends/iperf/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/iperf/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="3.9"
 PKG_SHA256="c6d8076b800f2b51f92dc941b0a9b77fbf2a867f623b5cb3cbf4754dabc40899"
 PKG_LICENSE="BSD"
 PKG_SITE="http://software.es.net/iperf/"
-PKG_URL="https://github.com/esnet/iperf/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/esnet/iperf/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain openssl"
 PKG_LONGDESC="A tool to measuring maximum TCP and UDP bandwidth performance."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/network-tools-depends/irssi/package.mk b/packages/addons/addon-depends/network-tools-depends/irssi/package.mk
index 7068c0c4bb..b5a004a7b2 100644
--- a/packages/addons/addon-depends/network-tools-depends/irssi/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/irssi/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="1.2.2"
 PKG_SHA256="6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.irssi.org/"
-PKG_URL="https://github.com/irssi/irssi/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/irssi/irssi/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain glib ncurses openssl"
 PKG_LONGDESC="Irssi is a terminal based IRC client for UNIX systems."
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \
+PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=${SYSROOT_PREFIX} \
         --disable-glibtest \
         --without-socks \
         --with-textui \
@@ -20,5 +20,5 @@ PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \
         --without-perl"
 
 pre_configure_target() {
-  export CFLAGS="$CFLAGS -I$PKG_BUILD"
+  export CFLAGS="${CFLAGS} -I${PKG_BUILD}"
 }
diff --git a/packages/addons/addon-depends/network-tools-depends/lftp/package.mk b/packages/addons/addon-depends/network-tools-depends/lftp/package.mk
index f944e56027..d81b2f7a57 100644
--- a/packages/addons/addon-depends/network-tools-depends/lftp/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/lftp/package.mk
@@ -14,5 +14,5 @@ PKG_BUILD_FLAGS="-sysroot"
 PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
                            --without-gnutls \
                            --with-openssl \
-                           --with-readline=$SYSROOT_PREFIX/usr \
-                           --with-zlib=$SYSROOT_PREFIX/usr"
+                           --with-readline=${SYSROOT_PREFIX}/usr \
+                           --with-zlib=${SYSROOT_PREFIX}/usr"
diff --git a/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk b/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk
index 9379f547ee..0a36e8f2f0 100644
--- a/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk
@@ -18,10 +18,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_librtmp_rtmp_h=yes \
             --without-curses"
 
 pre_configure_target() {
-  export CFLAGS="$CFLAGS -I../"
+  export CFLAGS="${CFLAGS} -I../"
 }
 
 pre_build_target() {
-  mkdir -p $PKG_BUILD/.$TARGET_NAME
-  cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
+  mkdir -p ${PKG_BUILD}/.${TARGET_NAME}
+  cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME}
 }
diff --git a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk
index d11042af2d..f64642e45a 100644
--- a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk
@@ -12,11 +12,11 @@ PKG_LONGDESC="A tool like GNU grep applied to the network layer."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="-sysroot -parallel"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-pcap-includes=$SYSROOT_PREFIX/usr/include \
+PKG_CONFIGURE_OPTS_TARGET="--with-pcap-includes=${SYSROOT_PREFIX}/usr/include \
                            --enable-ipv6 \
                            --disable-dropprivs"
 
 pre_build_target() {
-  mkdir -p $PKG_BUILD/.$TARGET_NAME
-  cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
+  mkdir -p ${PKG_BUILD}/.${TARGET_NAME}
+  cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME}
 }
diff --git a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk
index a0ff6b76e7..7e2a6bdc7f 100644
--- a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk
@@ -18,12 +18,12 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --with-libdnet=included \
                            --with-liblua=included \
                            --with-liblinear=included \
-                           --with-openssl=$SYSROOT_PREFIX"
+                           --with-openssl=${SYSROOT_PREFIX}"
 
 pre_configure_target() {
 # nmap fails to build in subdirs
-  cd $PKG_BUILD
-    rm -rf .$TARGET_NAME
+  cd ${PKG_BUILD}
+    rm -rf .${TARGET_NAME}
 
-  export CPPFLAGS="$CPPFLAGS -Iliblua"
+  export CPPFLAGS="${CPPFLAGS} -Iliblua"
 }
diff --git a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk
index 51b4eae0ac..0bfbe024a0 100644
--- a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk
@@ -6,15 +6,15 @@ PKG_VERSION="1.29.3"
 PKG_SHA256="e813ad62cccdc6081f00c081eb09b435e6ed58422a8f83e222e1aa9d7a0f0866"
 PKG_LICENSE="GPL3"
 PKG_SITE="https://github.com/hasse69/rar2fs"
-PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v$PKG_VERSION/rar2fs-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v${PKG_VERSION}/rar2fs-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse unrar"
 PKG_LONGDESC="FUSE file system for reading RAR archives"
 PKG_BUILD_FLAGS="-sysroot"
 
 pre_configure_target() {
-  PKG_CONFIGURE_OPTS_TARGET="--with-unrar=$PKG_BUILD/unrar \
-                             --with-unrar-lib=$PKG_BUILD/unrar \
+  PKG_CONFIGURE_OPTS_TARGET="--with-unrar=${PKG_BUILD}/unrar \
+                             --with-unrar-lib=${PKG_BUILD}/unrar \
                              --disable-static-unrar"
-  cp -a $(get_install_dir unrar)/usr/include/unrar $PKG_BUILD/
-  cp -p $(get_install_dir unrar)/usr/lib/libunrar.a $PKG_BUILD/unrar/
+  cp -a $(get_install_dir unrar)/usr/include/unrar ${PKG_BUILD}/
+  cp -p $(get_install_dir unrar)/usr/lib/libunrar.a ${PKG_BUILD}/unrar/
 }
diff --git a/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk b/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk
index c21b1d97a1..c1f1a2ae21 100644
--- a/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="2.10"
 PKG_SHA256="70845dde2d70606aa207db5edfe878e266f9c193f1956dd10ba1b7e9a3c8d101"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libfuse/sshfs"
-PKG_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-$PKG_VERSION/sshfs-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-${PKG_VERSION}/sshfs-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse glib"
 PKG_LONGDESC="A filesystem client based on the SSH File Transfer Protocol."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk b/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk
index 45d9f8fc23..2eae392ea2 100644
--- a/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk
@@ -18,7 +18,7 @@ pre_configure_target() {
   # When cross-compiling, configure can't set linux version
   # forcing it
   sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' ../configure
-  CFLAGS+=" -I$SYSROOT_PREFIX/usr/include/tirpc"
+  CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/tirpc"
   LDFLAGS+=" -ltirpc"
 }
 
diff --git a/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk b/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk
index 325592ffc9..fc1555b8dd 100644
--- a/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk
@@ -14,9 +14,9 @@ PKG_BUILD_FLAGS="-sysroot"
 PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr"
 
 post_unpack() {
-  mv $PKG_BUILD/README $PKG_BUILD/README-
-  mv $PKG_BUILD/chipmunk/* $PKG_BUILD
-  rmdir $PKG_BUILD/chipmunk
+  mv ${PKG_BUILD}/README ${PKG_BUILD}/README-
+  mv ${PKG_BUILD}/chipmunk/* ${PKG_BUILD}
+  rmdir ${PKG_BUILD}/chipmunk
 }
 
 configure_target() {
diff --git a/packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk b/packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk
index adb26db864..dce7f2138c 100644
--- a/packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="30.pre9"
 PKG_SHA256="abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/HewlettPackard/wireless-tools"
-PKG_URL="https://hewlettpackard.github.io/wireless-tools/$PKG_NAME.$PKG_VERSION.tar.gz"
+PKG_URL="https://hewlettpackard.github.io/wireless-tools/${PKG_NAME}.${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="The Wireless Tools (WT) is a set of tools allowing to manipulate the Wireless Extensions."
 PKG_BUILD_FLAGS="-sysroot"
 
 make_target() {
-  make PREFIX=/usr CC="$CC" AR="$AR" \
-    CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" iwmulticall
+  make PREFIX=/usr CC="${CC}" AR="${AR}" \
+    CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" iwmulticall
 }
 
 makeinstall_target() {
-  make PREFIX=$INSTALL/usr install-iwmulticall
+  make PREFIX=${INSTALL}/usr install-iwmulticall
 }
diff --git a/packages/addons/addon-depends/opus/package.mk b/packages/addons/addon-depends/opus/package.mk
index 6b591cdb94..6fd1d722e1 100644
--- a/packages/addons/addon-depends/opus/package.mk
+++ b/packages/addons/addon-depends/opus/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="1.3.1"
 PKG_SHA256="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.opus-codec.org"
-PKG_URL="https://archive.mozilla.org/pub/opus/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://archive.mozilla.org/pub/opus/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Codec designed for interactive speech and audio transmission over the Internet."
 PKG_TOOLCHAIN="configure"
 
-if [ "$TARGET_ARCH" = "arm" ]; then
+if [ "${TARGET_ARCH}" = "arm" ]; then
   PKG_FIXED_POINT="--enable-fixed-point"
 else
   PKG_FIXED_POINT="--disable-fixed-point"
@@ -19,4 +19,4 @@ fi
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared \
-                           $PKG_FIXED_POINT"
+                           ${PKG_FIXED_POINT}"
diff --git a/packages/addons/addon-depends/pngquant/package.mk b/packages/addons/addon-depends/pngquant/package.mk
index a71333c15f..ed91eb7809 100644
--- a/packages/addons/addon-depends/pngquant/package.mk
+++ b/packages/addons/addon-depends/pngquant/package.mk
@@ -15,13 +15,13 @@ configure_host() {
 }
 
 make_host() {
-  cd $PKG_BUILD
-  BIN=$PKG_BUILD/pngquant make
+  cd ${PKG_BUILD}
+  BIN=${PKG_BUILD}/pngquant make
 
-  $STRIP $PKG_BUILD/pngquant
+  ${STRIP} ${PKG_BUILD}/pngquant
 }
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/bin
-    cp $PKG_BUILD/pngquant $TOOLCHAIN/bin
+  mkdir -p ${TOOLCHAIN}/bin
+    cp ${PKG_BUILD}/pngquant ${TOOLCHAIN}/bin
 }
diff --git a/packages/addons/addon-depends/protobuf/package.mk b/packages/addons/addon-depends/protobuf/package.mk
index 7112e3bb7b..f448b0ab8f 100644
--- a/packages/addons/addon-depends/protobuf/package.mk
+++ b/packages/addons/addon-depends/protobuf/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="3.14.0"
 PKG_SHA256="50ec5a07c0c55d4ec536dd49021f2e194a26bfdbc531d03d1e9d4d3e27175659"
 PKG_LICENSE="OSS"
 PKG_SITE="https://developers.google.com/protocol-buffers/"
-PKG_URL="https://github.com/google/$PKG_NAME/releases/download/v$PKG_VERSION/$PKG_NAME-cpp-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/google/${PKG_NAME}/releases/download/v${PKG_VERSION}/${PKG_NAME}-cpp-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="toolchain:host zlib:host"
 PKG_DEPENDS_TARGET="toolchain zlib protobuf:host"
 PKG_LONGDESC="Protocol Buffers for Google's data interchange format."
@@ -17,16 +17,16 @@ PKG_CMAKE_OPTS_HOST="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
                      -Dprotobuf_BUILD_EXAMPLES=0 \
                      -Dprotobuf_WITH_ZLIB=1"
 
-PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_HOST"
+PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_HOST}"
 
 configure_package() {
-  PKG_CMAKE_SCRIPT="$PKG_BUILD/cmake/CMakeLists.txt"
+  PKG_CMAKE_SCRIPT="${PKG_BUILD}/cmake/CMakeLists.txt"
 }
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
+  rm -rf ${INSTALL}/usr/bin
 
-  # HACK: we have protoc in $TOOLCHAIN/bin but it seems
+  # HACK: we have protoc in ${TOOLCHAIN}/bin but it seems
   # the one from sysroot prefix is picked when building hyperion. remove it!
-  rm -f $SYSROOT_PREFIX/usr/bin/protoc
+  rm -f ${SYSROOT_PREFIX}/usr/bin/protoc
 }
diff --git a/packages/addons/addon-depends/qtbase/package.mk b/packages/addons/addon-depends/qtbase/package.mk
index c6364225e9..adc312d88c 100644
--- a/packages/addons/addon-depends/qtbase/package.mk
+++ b/packages/addons/addon-depends/qtbase/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="5.14.0"
 PKG_SHA256="4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463"
 PKG_LICENSE="GPL"
 PKG_SITE="http://qt-project.org"
-PKG_URL="http://download.qt.io/archive/qt/${PKG_VERSION%.*}/$PKG_VERSION/submodules/$PKG_NAME-everywhere-src-$PKG_VERSION.tar.xz"
+PKG_URL="http://download.qt.io/archive/qt/${PKG_VERSION%.*}/${PKG_VERSION}/submodules/${PKG_NAME}-everywhere-src-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="freetype libjpeg-turbo libpng openssl sqlite zlib"
 PKG_LONGDESC="A cross-platform application and UI framework."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk b/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk
index fa9541ec0b..8576e9c11a 100644
--- a/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk
+++ b/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk
@@ -7,16 +7,16 @@ PKG_SHA256="7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f"
 PKG_ARCH="arm"
 PKG_LICENSE="MIT"
 PKG_SITE="http://sourceforge.net/p/raspberry-gpio-python/"
-PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="A module to control Raspberry Pi GPIO channels."
 PKG_TOOLCHAIN="manual"
 
 pre_configure_target() {
-  export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
-  export LDSHARED="$CC -shared"
-  export CFLAGS="$CFLAGS -fcommon"
-  export CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/$PKG_PYTHON_VERSION"
+  export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr"
+  export LDSHARED="${CC} -shared"
+  export CFLAGS="${CFLAGS} -fcommon"
+  export CPPFLAGS="${TARGET_CPPFLAGS} -I${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION}"
 }
 
 make_target() {
diff --git a/packages/addons/addon-depends/rpi-tools-depends/gpiozero/package.mk b/packages/addons/addon-depends/rpi-tools-depends/gpiozero/package.mk
index eea3936842..6d88a1ffaf 100644
--- a/packages/addons/addon-depends/rpi-tools-depends/gpiozero/package.mk
+++ b/packages/addons/addon-depends/rpi-tools-depends/gpiozero/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="ae1a8dc4e6e793ffd8f900968f3290d218052c46347fa0c0503c65fabe422e4d"
 PKG_ARCH="arm"
 PKG_LICENSE="BSD"
 PKG_SITE="https://github.com/RPi-Distro/python-gpiozero"
-PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A simple interface to everyday GPIO components used with Raspberry Pi."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk b/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk
index 17177a72d1..d6b814c322 100644
--- a/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk
+++ b/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk
@@ -7,15 +7,15 @@ PKG_SHA256="27d607d3c5c7b142681dcd9fd0afecb7fcb052abfaffc330b28906f782e602f3"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mockmoon-cybernetics.ch/computer/raspberry-pi/lan951x-led-ctl/"
-PKG_URL="https://mockmoon-cybernetics.ch/cgi/cgit/lan951x-led-ctl.git/snapshot/lan951x-led-ctl-$PKG_VERSION.tar.xz"
+PKG_URL="https://mockmoon-cybernetics.ch/cgi/cgit/lan951x-led-ctl.git/snapshot/lan951x-led-ctl-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libusb"
 PKG_LONGDESC="Control LEDs connected to LAN9512/LAN9514 ethernet USB controllers."
 PKG_TOOLCHAIN="manual"
 
 make_target() {
-  $CC -std=c11 -I./include -Wall -Wstrict-prototypes -Wconversion \
+  ${CC} -std=c11 -I./include -Wall -Wstrict-prototypes -Wconversion \
       -Wmissing-prototypes -Wshadow -Wextra -Wunused \
-      $CFLAGS -lusb-1.0 $LDFLAGS -o lan951x-led-ctl src/lan951x-led-ctl.c
+      ${CFLAGS} -lusb-1.0 ${LDFLAGS} -o lan951x-led-ctl src/lan951x-led-ctl.c
 
-  $STRIP lan951x-led-ctl
+  ${STRIP} lan951x-led-ctl
 }
diff --git a/packages/addons/addon-depends/rpi_ws281x/package.mk b/packages/addons/addon-depends/rpi_ws281x/package.mk
index 0adb1aa1de..32e60b6efb 100644
--- a/packages/addons/addon-depends/rpi_ws281x/package.mk
+++ b/packages/addons/addon-depends/rpi_ws281x/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="6c5ade93d1af78cd19e60ee5ecc34adfd111b186"
 PKG_SHA256="e8fb94429edc21cfd894548755a417eb5b2e121329f4b54270cfb3f727696e21"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="https://github.com/hyperion-project/rpi_ws281x"
-PKG_URL="https://github.com/hyperion-project/rpi_ws281x/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/hyperion-project/rpi_ws281x/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Userspace Raspberry Pi PWM library for WS281X LEDs."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/rsyslog-depends/libestr/package.mk b/packages/addons/addon-depends/rsyslog-depends/libestr/package.mk
index 7600a6f03d..152be1f437 100644
--- a/packages/addons/addon-depends/rsyslog-depends/libestr/package.mk
+++ b/packages/addons/addon-depends/rsyslog-depends/libestr/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0.1.11"
 PKG_SHA256="46b53b80f875fd82981d927a45f0c9df9d17ee1d0e29efab76aaa9cd54a46bb4"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libestr.adiscon.com"
-PKG_URL="https://github.com/rsyslog/libestr/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/rsyslog/libestr/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_TOOLCHAIN="autotools"
 PKG_LONGDESC="Some essentials for string handling."
diff --git a/packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk b/packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk
index 8949dd1b6f..f4dded89bb 100644
--- a/packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk
+++ b/packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0.99.8"
 PKG_SHA256="3544c757668b4a257825b3cbc26f800f59ef3c1ff2a260f40f96b48ab1d59e07"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.rsyslog.com/tag/libfastjson"
-PKG_URL="http://download.rsyslog.com/libfastjson/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://download.rsyslog.com/libfastjson/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A fast json library for C."
 PKG_BUILD_FLAGS="+pic"
diff --git a/packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk b/packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk
index cd05a04d02..523dbc8c9a 100644
--- a/packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk
+++ b/packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.0.6"
 PKG_SHA256="338c6174e5c8652eaa34f956be3451f7491a4416ab489aef63151f802b00bf93"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.liblogging.org"
-PKG_URL="http://download.rsyslog.com/liblogging/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://download.rsyslog.com/liblogging/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain systemd"
 PKG_LONGDESC="An easy to use and lightweight signal-safe logging library."
 
diff --git a/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk b/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk
index 225fed909e..2ae1b6d8d7 100644
--- a/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk
+++ b/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="2.0.6"
 PKG_SHA256="594ea3318ef419cb7f21cf81c513db35a838b32207999a11a82b709da9ff9a2b"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.liblognorm.com"
-PKG_URL="https://github.com/rsyslog/liblognorm/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/rsyslog/liblognorm/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libestr libfastjson"
 PKG_TOOLCHAIN="autotools"
 PKG_LONGDESC="A fast samples-based log normalization library."
diff --git a/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk b/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk
index 89770c6ee1..ee6d5ba480 100644
--- a/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk
+++ b/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.9.0"
 PKG_SHA256="24ee9e843960d1400a44ffaedb0b1ec91463df8f8acca869cc027ed25ee6bf33"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.rsyslog.com/category/librelp/"
-PKG_URL="http://download.rsyslog.com/librelp/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://download.rsyslog.com/librelp/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Provides reliable event logging over the network."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk
index d553dc73da..fe773eae2e 100644
--- a/packages/addons/addon-depends/runc/package.mk
+++ b/packages/addons/addon-depends/runc/package.mk
@@ -18,17 +18,17 @@ PKG_GIT_COMMIT="ff819c7e9184c13b7c2607fe6c30ae19403a7aff"
 pre_make_target() {
   go_configure
 
-  export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_GIT_COMMIT} -X main.version=$(cat ./VERSION) -extld $CC"
+  export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_GIT_COMMIT} -X main.version=$(cat ./VERSION) -extld ${CC}"
 
   mkdir -p ${GOPATH}
-  if [ -d $PKG_BUILD/vendor ]; then
-    mv $PKG_BUILD/vendor ${GOPATH}/src
+  if [ -d ${PKG_BUILD}/vendor ]; then
+    mv ${PKG_BUILD}/vendor ${GOPATH}/src
   fi
 
-  ln -fs $PKG_BUILD ${GOPATH}/src/github.com/opencontainers/runc
+  ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/opencontainers/runc
 }
 
 make_target() {
   mkdir -p bin
-  $GOLANG build -v -o bin/runc -a -tags "cgo static_build" -ldflags "$LDFLAGS" ./
+  ${GOLANG} build -v -o bin/runc -a -tags "cgo static_build" -ldflags "${LDFLAGS}" ./
 }
diff --git a/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk b/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk
index 4688caf7cf..21baa5d2d4 100644
--- a/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk
+++ b/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.4.0"
 PKG_SHA256="cce5b8f5408cfd19b4d4eb678274d0c74490dc0eb2bdc8f97c852036897d6099"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/badaix/aixlog"
-PKG_URL="https://github.com/badaix/aixlog/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/badaix/aixlog/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Header-only C++ logging library."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk b/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk
index 3157f3ba92..ebdb7d068d 100644
--- a/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk
+++ b/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk
@@ -7,15 +7,15 @@ PKG_VERSION="1.2.2"
 PKG_SHA256="1c0f06450c928d711719686c9dbece2d480184f36fab11b8f0534cb7b41e337d"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.alsa-project.org/"
-PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain alsa-lib"
 PKG_LONGDESC="Alsa plugins."
 
-if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio"
+if [ "${PULSEAUDIO_SUPPORT}" = yes ]; then
+  PKG_DEPENDS_TARGET+=" pulseaudio"
   SUBDIR_PULSEAUDIO="pulse"
 fi
 
 PKG_CONFIGURE_OPTS_TARGET="--with-plugindir=/usr/lib/alsa"
-PKG_MAKE_OPTS_TARGET="SUBDIRS=$SUBDIR_PULSEAUDIO"
-PKG_MAKEINSTALL_OPTS_TARGET="SUBDIRS=$SUBDIR_PULSEAUDIO"
+PKG_MAKE_OPTS_TARGET="SUBDIRS=${SUBDIR_PULSEAUDIO}"
+PKG_MAKEINSTALL_OPTS_TARGET="SUBDIRS=${SUBDIR_PULSEAUDIO}"
diff --git a/packages/addons/addon-depends/snapcast-depends/asio/package.mk b/packages/addons/addon-depends/snapcast-depends/asio/package.mk
index 4eb5ea36e1..e479e79aa3 100644
--- a/packages/addons/addon-depends/snapcast-depends/asio/package.mk
+++ b/packages/addons/addon-depends/snapcast-depends/asio/package.mk
@@ -16,5 +16,5 @@ PKG_BUILD_FLAGS="-sysroot"
 PKG_CONFIGURE_OPTS_TARGET="--without-boost --without-openssl"
 
 post_unpack() {
-  mv $PKG_BUILD/asio/* $PKG_BUILD
+  mv ${PKG_BUILD}/asio/* ${PKG_BUILD}
 }
diff --git a/packages/addons/addon-depends/snapcast-depends/popl/package.mk b/packages/addons/addon-depends/snapcast-depends/popl/package.mk
index 963fbe82c7..5ad00a492e 100644
--- a/packages/addons/addon-depends/snapcast-depends/popl/package.mk
+++ b/packages/addons/addon-depends/snapcast-depends/popl/package.mk
@@ -6,13 +6,13 @@ PKG_VERSION="1.2.0"
 PKG_SHA256="dee63eed9bac3da9ec0008902c7ec72caa319461b20fc116e57e45948671a0bf"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/badaix/popl"
-PKG_URL="https://github.com/badaix/popl/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/badaix/popl/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Header-only C++ program options parser library."
 PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="-sysroot"
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/include
-  cp -p $PKG_BUILD/include/popl.hpp $INSTALL/usr/include
+  mkdir -p ${INSTALL}/usr/include
+  cp -p ${PKG_BUILD}/include/popl.hpp ${INSTALL}/usr/include
 }
diff --git a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk
index 952fd0d3f1..d52f0089fc 100644
--- a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk
+++ b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="3.3.7"
 PKG_SHA256="7f8d4ecec53f2f681a962467bf09205568fc936c8c31a9ee07b1bd72d3d95b12"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/mikebrady/shairport-sync"
-PKG_URL="https://github.com/mikebrady/shairport-sync/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/mikebrady/shairport-sync/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain alsa-lib avahi libconfig libdaemon openssl popt pulseaudio soxr"
 PKG_LONGDESC="AirPlay audio player."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk
index bf9b8ebbc2..49e953eb9b 100644
--- a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk
+++ b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0.23.0"
 PKG_SHA256="70efdeea60021f493f77ba1f3d00784911463cad11c6df214ecb19d74899b611"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/badaix/snapcast"
-PKG_URL="https://github.com/badaix/snapcast/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/badaix/snapcast/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain aixlog alsa-lib asio avahi flac libvorbis popl boost opus"
 PKG_LONGDESC="Synchronous multi-room audio player."
 PKG_TOOLCHAIN="make"
@@ -14,14 +14,14 @@ PKG_BUILD_FLAGS="-sysroot"
 
 pre_configure_target() {
   cd ..
-  rm -rf .$TARGET_NAME
-  CXXFLAGS="$CXXFLAGS -pthread \
+  rm -rf .${TARGET_NAME}
+  CXXFLAGS="${CXXFLAGS} -pthread \
                       -I$(get_install_dir aixlog)/usr/include \
                       -I$(get_install_dir asio)/usr/include \
                       -I$(get_install_dir popl)/usr/include"
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  cp -p server/snapserver client/snapclient $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  cp -p server/snapserver client/snapclient ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/autossh/package.mk b/packages/addons/addon-depends/system-tools-depends/autossh/package.mk
index 318f7998b2..9d5ca84e60 100644
--- a/packages/addons/addon-depends/system-tools-depends/autossh/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/autossh/package.mk
@@ -16,10 +16,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes"
 
 pre_configure_target() {
-  export CFLAGS="$CFLAGS -I."
+  export CFLAGS="${CFLAGS} -I."
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  cp -p autossh $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  cp -p autossh ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk
index aeb69c70c8..1261d99ff2 100644
--- a/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk
@@ -7,13 +7,13 @@ PKG_SHA256="016dfae596b691c8d38e488f8bfac3ba437befc260a6f32e60dd390595c9f3e9"
 PKG_ARCH="x86_64"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://github.com/rhboot/efivar"
-PKG_URL="https://github.com/rhboot/efivar/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/rhboot/efivar/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain efivar:host"
 PKG_LONGDESC="Tools and library to manipulate EFI variables."
 
 pre_make_host() {
-  export TOPDIR=$PKG_BUILD
+  export TOPDIR=${PKG_BUILD}
 }
 
 make_host() {
@@ -22,7 +22,7 @@ make_host() {
 
 pre_make_target() {
   sed -e 's/-Werror//' -i src/include/gcc.specs
-  export TOPDIR=$PKG_BUILD
+  export TOPDIR=${PKG_BUILD}
 }
 
 make_target() {
@@ -34,9 +34,9 @@ makeinstall_host() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp -P src/libefivar.a src/libefiboot.a $SYSROOT_PREFIX/usr/lib/
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib
+    cp -P src/libefivar.a src/libefiboot.a ${SYSROOT_PREFIX}/usr/lib/
 
-  mkdir -p $SYSROOT_PREFIX/usr/include/efivar
-    cp -P src/include/efivar/*.h $SYSROOT_PREFIX/usr/include/efivar
+  mkdir -p ${SYSROOT_PREFIX}/usr/include/efivar
+    cp -P src/include/efivar/*.h ${SYSROOT_PREFIX}/usr/include/efivar
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk
index 9cad351207..cab3421a83 100644
--- a/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.1.18"
 PKG_SHA256="7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libmtp.sourceforge.net/"
-PKG_URL="$SOURCEFORGE_SRC/project/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="${SOURCEFORGE_SRC}/project/${PKG_NAME}/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libusb"
 PKG_LONGDESC="An Initiator implementation of the Media Transfer Protocol (MTP)."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk
index d825fc415c..10cac399a6 100644
--- a/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.9.0"
 PKG_SHA256="d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd"
 PKG_LICENSE="BSD"
 PKG_SITE="https://www.libssh2.org"
-PKG_URL="https://www.libssh2.org/download/libssh2-$PKG_VERSION.tar.gz"
+PKG_URL="https://www.libssh2.org/download/libssh2-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain openssl"
 PKG_LONGDESC="A library implementing the SSH2 protocol"
 PKG_BUILD_FLAGS="+pic"
diff --git a/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk
index 956463d02a..b8eb7d56ff 100644
--- a/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk
@@ -6,6 +6,6 @@ PKG_VERSION="6.9.6"
 PKG_SHA256="bd0faeb887f748193282848d01ec2dad8943b5dfcb8dc03ed52dcc963549e819"
 PKG_LICENSE="BSD"
 PKG_SITE="https://github.com/kkos/oniguruma"
-PKG_URL="https://github.com/kkos/oniguruma/releases/download/v$PKG_VERSION/onig-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/kkos/oniguruma/releases/download/v${PKG_VERSION}/onig-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A regular expression library"
diff --git a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk
index fc1727fbe1..4643abb80b 100644
--- a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="3.7"
 PKG_SHA256="b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/diffutils/"
-PKG_URL="http://ftpmirror.gnu.org/diffutils/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftpmirror.gnu.org/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A package of several programs related to finding differences between files."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/system-tools-depends/dstat/package.mk b/packages/addons/addon-depends/system-tools-depends/dstat/package.mk
index 31c22b033b..9c65e0fed8 100644
--- a/packages/addons/addon-depends/system-tools-depends/dstat/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/dstat/package.mk
@@ -6,17 +6,17 @@ PKG_VERSION="e428c7dc7137f81f8ca6bef8854b37a4ddd4f337" # 19 Jun 2020
 PKG_SHA256="3315f5cefc7cd4e968430baa19247fc32af36dd42c9ad3edf5962ae4f597013f"
 PKG_LICENSE="GPL"
 PKG_SITE="http://dag.wiee.rs/home-made/dstat"
-PKG_URL="https://github.com/dstat-real/dstat/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/dstat-real/dstat/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3"
 PKG_LONGDESC="Versatile resource statistics tool."
 PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="-sysroot"
 
 post_unpack() {
-  rm $PKG_BUILD/Makefile
+  rm ${PKG_BUILD}/Makefile
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  cp -p dstat $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  cp -p dstat ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/dtach/package.mk b/packages/addons/addon-depends/system-tools-depends/dtach/package.mk
index 87616ea491..4bdb8c8d74 100644
--- a/packages/addons/addon-depends/system-tools-depends/dtach/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/dtach/package.mk
@@ -12,6 +12,6 @@ PKG_LONGDESC="A program that emulates the detach feature of screen."
 PKG_BUILD_FLAGS="-sysroot"
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  cp -p dtach $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  cp -p dtach ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk b/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk
index c5e4c4bb84..57f6734eab 100644
--- a/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk
@@ -7,14 +7,14 @@ PKG_SHA256="e951ce9e0534c63bb71ba8b2a3830d4402e51440cb4d524d18c1ef40ae5ee218"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/rhboot/efibootmgr"
-PKG_URL="https://github.com/rhboot/efibootmgr/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/rhboot/efibootmgr/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain efivar pciutils zlib"
 PKG_LONGDESC="Tool to modify UEFI Firmware Boot Manager Variables."
 PKG_BUILD_FLAGS="-sysroot"
 
 make_target() {
-  export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include -I$SYSROOT_PREFIX/usr/include/efivar -fgnu89-inline -Wno-pointer-sign"
-  export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -ludev -ldl"
+  export CFLAGS="${CFLAGS} -I${SYSROOT_PREFIX}/usr/include -I${SYSROOT_PREFIX}/usr/include/efivar -fgnu89-inline -Wno-pointer-sign"
+  export LDFLAGS="${LDFLAGS} -L${SYSROOT_PREFIX}/usr/lib -ludev -ldl"
 
   make EFIDIR=BOOT EFI_LOADER=bootx64.efi PKG_CONFIG=true \
     LDLIBS="-lefiboot -lefivar" \
@@ -22,6 +22,6 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  cp -p src/efibootmgr $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  cp -p src/efibootmgr ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/encfs/package.mk b/packages/addons/addon-depends/system-tools-depends/encfs/package.mk
index 3e4e505fea..0838b1acaa 100644
--- a/packages/addons/addon-depends/system-tools-depends/encfs/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/encfs/package.mk
@@ -6,11 +6,11 @@ PKG_VERSION="1.9.5"
 PKG_SHA256="4709f05395ccbad6c0a5b40a4619d60aafe3473b1a79bafb3aa700b1f756fd63"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://vgough.github.io/encfs/"
-PKG_URL="https://github.com/vgough/encfs/releases/download/v$PKG_VERSION/encfs-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/vgough/encfs/releases/download/v${PKG_VERSION}/encfs-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse openssl"
 PKG_LONGDESC="A Encrypted Filesystem for FUSE."
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_PREFIX=/usr \
-                       -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=$SYSROOT_PREFIX/usr/include \
+                       -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=${SYSROOT_PREFIX}/usr/include \
                        -DBUILD_UNIT_TESTS=OFF"
diff --git a/packages/addons/addon-depends/system-tools-depends/evtest/package.mk b/packages/addons/addon-depends/system-tools-depends/evtest/package.mk
index dff2c5cb52..7577a93af1 100644
--- a/packages/addons/addon-depends/system-tools-depends/evtest/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/evtest/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.34"
 PKG_SHA256="8e2431cdc83587925048157a5772aa0c79b79a64ae5815bf004634cbe53597d0"
 PKG_LICENSE="GPL"
 PKG_SITE="http://cgit.freedesktop.org/evtest/"
-PKG_URL="https://repo.or.cz/evtest.git/snapshot/evtest-$PKG_VERSION.tar.gz"
+PKG_URL="https://repo.or.cz/evtest.git/snapshot/evtest-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libxml2"
 PKG_LONGDESC="A simple tool for input event debugging."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/system-tools-depends/getscancodes/package.mk b/packages/addons/addon-depends/system-tools-depends/getscancodes/package.mk
index e54e707379..e7b9a4e32f 100644
--- a/packages/addons/addon-depends/system-tools-depends/getscancodes/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/getscancodes/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="1.0"
 PKG_SHA256="5f4e2ab22dc3890392ab8870fb79bbebdfd39b34dcd5bafcb51edee554855d34"
 PKG_LICENSE="GPL"
 PKG_SITE="http://keytouch.sourceforge.net"
-PKG_URL="$SOURCEFORGE_SRC/keytouch/getscancodes-${PKG_VERSION}.tar.gz"
+PKG_URL="${SOURCEFORGE_SRC}/keytouch/getscancodes-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Shows the scancode of the pressed or released key."
 PKG_BUILD_FLAGS="-sysroot"
 
 pre_configure_target() {
-  PKG_MAKE_OPTS_TARGET="CC=$CC"
+  PKG_MAKE_OPTS_TARGET="CC=${CC}"
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  cp -p getscancodes $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  cp -p getscancodes ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk b/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk
index 1b89d09805..5057d18bd1 100644
--- a/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk
@@ -14,6 +14,6 @@ PKG_BUILD_FLAGS="-sysroot"
 PKG_CONFIGURE_OPTS_TARGET="--with-db-path=/storage/.kodi/addons/virtual.system-tools/data/hddtemp.db"
 
 post_makeinstall_target() {
-  mkdir -p $INSTALL/usr/share/misc
-  cp $PKG_DIR/db/* $INSTALL/usr/share/misc
+  mkdir -p ${INSTALL}/usr/share/misc
+  cp ${PKG_DIR}/db/* ${INSTALL}/usr/share/misc
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/hid_mapper/package.mk b/packages/addons/addon-depends/system-tools-depends/hid_mapper/package.mk
index 5f62c30ea5..f115bd993d 100644
--- a/packages/addons/addon-depends/system-tools-depends/hid_mapper/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/hid_mapper/package.mk
@@ -12,6 +12,6 @@ PKG_LONGDESC="A Generic HID mapper."
 PKG_BUILD_FLAGS="-sysroot"
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  cp -p hid_mapper $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  cp -p hid_mapper ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/htop/package.mk b/packages/addons/addon-depends/system-tools-depends/htop/package.mk
index b6725123e1..4f85829ecb 100644
--- a/packages/addons/addon-depends/system-tools-depends/htop/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/htop/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="3.0.5"
 PKG_SHA256="4c2629bd50895bd24082ba2f81f8c972348aa2298cc6edc6a21a7fa18b73990c"
 PKG_LICENSE="GPL"
 PKG_SITE="https://hisham.hm/htop"
-PKG_URL="https://github.com/htop-dev/htop/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/htop-dev/htop/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="An interactive process viewer for Unix."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk b/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk
index af69152e10..ca04b2eaa5 100644
--- a/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk
@@ -6,22 +6,22 @@ PKG_VERSION="4.2"
 PKG_SHA256="37f2dabc7082d185903ff21d1f584b5dcb4dd2eb2c879bbd8d7c50ae900dacd6"
 PKG_LICENSE="GPL"
 PKG_SITE="https://i2c.wiki.kernel.org/index.php/I2C_Tools"
-PKG_URL="https://www.kernel.org/pub/software/utils/i2c-tools/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://www.kernel.org/pub/software/utils/i2c-tools/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="A heterogeneous set of I2C tools for Linux."
 PKG_BUILD_FLAGS="-sysroot"
 
 pre_make_target() {
-  export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
-  export LDSHARED="$CC -shared"
+  export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr"
+  export LDSHARED="${CC} -shared"
 }
 
 make_target() {
   make  EXTRA="py-smbus" \
-        CC="$CC" \
-        AR="$AR" \
-        CFLAGS="$TARGET_CFLAGS" \
-        CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/$PKG_PYTHON_VERSION" \
+        CC="${CC}" \
+        AR="${AR}" \
+        CFLAGS="${TARGET_CFLAGS}" \
+        CPPFLAGS="${TARGET_CPPFLAGS} -I${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION}" \
         PYTHON=${TOOLCHAIN}/bin/python3
 }
 
diff --git a/packages/addons/addon-depends/system-tools-depends/inotify-tools/package.mk b/packages/addons/addon-depends/system-tools-depends/inotify-tools/package.mk
index 7674deb3fc..99e21da1fc 100644
--- a/packages/addons/addon-depends/system-tools-depends/inotify-tools/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/inotify-tools/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="3.20.11.0"
 PKG_SHA256="58a3cde89e4a5111a87ac16b56b06a8f885460fca0aea51b69c856ce30a37a14"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://wiki.github.com/inotify-tools/inotify-tools/"
-PKG_URL="https://github.com/inotify-tools/inotify-tools/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/inotify-tools/inotify-tools/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A C library and a set of command-line programs for Linux providing a simple interface to inotify."
 PKG_TOOLCHAIN="autotools"
@@ -15,5 +15,5 @@ PKG_BUILD_FLAGS="-sysroot"
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-doxygen"
 
 pre_configure_target() {
-  CFLAGS="$CFLAGS -Wno-error=misleading-indentation"
+  CFLAGS+=" -Wno-error=misleading-indentation"
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/jq/package.mk b/packages/addons/addon-depends/system-tools-depends/jq/package.mk
index 2cad7d63d3..ad41d1de3b 100644
--- a/packages/addons/addon-depends/system-tools-depends/jq/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/jq/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.6"
 PKG_SHA256="5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72"
 PKG_LICENSE="MIT"
 PKG_SITE="http://stedolan.github.io/jq/"
-PKG_URL="https://github.com/stedolan/jq/releases/download/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/stedolan/jq/releases/download/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain oniguruma"
 PKG_LONGDESC="A like sed for JSON data."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk b/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk
index 46b554082a..f9c287dc27 100644
--- a/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk
@@ -13,12 +13,12 @@ PKG_LONGDESC="Provides user-space support for the hardware monitoring drivers."
 PKG_BUILD_FLAGS="-sysroot"
 
 pre_make_target() {
-  PKG_MAKE_OPTS_TARGET="PREFIX=/usr CC=$CC AR=$AR"
+  PKG_MAKE_OPTS_TARGET="PREFIX=/usr CC=${CC} AR=${AR}"
 
-  export CFLAGS="$TARGET_CFLAGS"
-  export CPPFLAGS="$TARGET_CPPFLAGS"
+  export CFLAGS="${TARGET_CFLAGS}"
+  export CPPFLAGS="${TARGET_CPPFLAGS}"
 }
 
 pre_makeinstall_target() {
-  PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr CC=$CC AR=$AR"
+  PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr CC=${CC} AR=${AR}"
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/lshw/package.mk b/packages/addons/addon-depends/system-tools-depends/lshw/package.mk
index 7af4bd9371..0973d638f3 100644
--- a/packages/addons/addon-depends/system-tools-depends/lshw/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/lshw/package.mk
@@ -12,5 +12,5 @@ PKG_LONGDESC="A small tool to provide detailed information on the hardware confi
 PKG_BUILD_FLAGS="-sysroot"
 
 make_target() {
-  make CXX=$CXX -C src/
+  make CXX=${CXX} -C src/
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/mc/package.mk b/packages/addons/addon-depends/system-tools-depends/mc/package.mk
index 41dd4a402f..2e69fe4c83 100644
--- a/packages/addons/addon-depends/system-tools-depends/mc/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/mc/package.mk
@@ -18,7 +18,7 @@ PKG_CONFIGURE_OPTS_TARGET=" \
   --with-homedir=/storage/.kodi/userdata/addon_data/virtual.system-tools \
   --sysconfdir=/storage/.kodi/addons/virtual.system-tools/etc \
   --with-screen=ncurses \
-  --with-sysroot=$SYSROOT_PREFIX \
+  --with-sysroot=${SYSROOT_PREFIX} \
   --disable-aspell \
   --without-diff-viewer \
   --disable-doxygen-doc \
@@ -37,13 +37,13 @@ PKG_CONFIGURE_OPTS_TARGET=" \
   --without-x"
 
 pre_configure_target() {
-  LDFLAGS="$LDFLAGS -lcrypto -lssl"
+  LDFLAGS+=" -lcrypto -lssl"
 }
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/locale
-  rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/mc/help/mc.hlp.*
-  mv $INSTALL/usr/bin/mc $INSTALL/usr/bin/mc-bin
-  rm -f $INSTALL/usr/bin/{mcedit,mcview}
-  cp -p $PKG_DIR/wrapper/* $INSTALL/usr/bin
+  rm -rf ${INSTALL}/storage/.kodi/addons/virtual.system-tools/data/locale
+  rm -rf ${INSTALL}/storage/.kodi/addons/virtual.system-tools/data/mc/help/mc.hlp.*
+  mv ${INSTALL}/usr/bin/mc ${INSTALL}/usr/bin/mc-bin
+  rm -f ${INSTALL}/usr/bin/{mcedit,mcview}
+  cp -p ${PKG_DIR}/wrapper/* ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/nmon/package.mk b/packages/addons/addon-depends/system-tools-depends/nmon/package.mk
index a82ada5b63..2b680fd3f6 100644
--- a/packages/addons/addon-depends/system-tools-depends/nmon/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/nmon/package.mk
@@ -18,7 +18,7 @@ unpack() {
 }
 
 make_target() {
-  case $ARCH in
+  case ${ARCH} in
     x86_64)
       arch="X86"
       ;;
@@ -28,12 +28,12 @@ make_target() {
   esac
   # original makefile is located at
   # - https://downloads.sourceforge.net/project/nmon/makefile
-  CFLAGS="$CFLAGS -g -O3 -Wall -D JFS -D GETUSER -D LARGEMEM"
-  LDFLAGS="$LDFLAGS -lncurses -lm -g"
-  $CC -o nmon nmon-${PKG_VERSION}.c $CFLAGS $LDFLAGS -D $arch -DUBUNTU
+  CFLAGS+=" -g -O3 -Wall -D JFS -D GETUSER -D LARGEMEM"
+  LDFLAGS+=" -lncurses -lm -g"
+  ${CC} -o nmon nmon-${PKG_VERSION}.c ${CFLAGS} ${LDFLAGS} -D ${arch} -DUBUNTU
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-  cp -p nmon $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  cp -p nmon ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/patch/package.mk b/packages/addons/addon-depends/system-tools-depends/patch/package.mk
index d90167ec39..e06545a118 100644
--- a/packages/addons/addon-depends/system-tools-depends/patch/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/patch/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="2.7.6"
 PKG_SHA256="ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd"
 PKG_LICENSE="GPL"
 PKG_SITE="http://savannah.gnu.org/projects/patch/"
-PKG_URL="http://ftpmirror.gnu.org/patch/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftpmirror.gnu.org/patch/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Patch takes a patch file containing a difference listing produced by the diff."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/system-tools-depends/pv/package.mk b/packages/addons/addon-depends/system-tools-depends/pv/package.mk
index 1f9428bfce..9a7eca3638 100644
--- a/packages/addons/addon-depends/system-tools-depends/pv/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/pv/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.6.6"
 PKG_SHA256="608ef935f7a377e1439c181c4fc188d247da10d51a19ef79bcdee5043b0973f1"
 PKG_LICENSE="GNU"
 PKG_SITE="http://www.ivarch.com/programs/pv.shtml"
-PKG_URL="http://www.ivarch.com/programs/sources/pv-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.ivarch.com/programs/sources/pv-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Pipe Viwer can be inserted into any normal pipeline between two processes."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/system-tools-depends/screen/package.mk b/packages/addons/addon-depends/system-tools-depends/screen/package.mk
index 00244d7db9..f871b24ec0 100644
--- a/packages/addons/addon-depends/system-tools-depends/screen/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/screen/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="4.8.0"
 PKG_SHA256="6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/screen/"
-PKG_URL="http://ftpmirror.gnu.org/screen/$PKG_NAME-${PKG_VERSION}.tar.gz"
+PKG_URL="http://ftpmirror.gnu.org/screen/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="Screen is a window manager that multiplexes a physical terminal between several processes"
 PKG_BUILD_FLAGS="-sysroot -parallel"
diff --git a/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk b/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk
index c184389536..28b1d9ee16 100644
--- a/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="7.2"
 PKG_SHA256="5cd98a27e6393168bc6aaea070d9e1cd551b0f898c52f66b2ff2e5d274118cd6"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.smartmontools.org"
-PKG_URL="https://downloads.sourceforge.net/sourceforge/smartmontools/smartmontools-$PKG_VERSION.tar.gz"
+PKG_URL="https://downloads.sourceforge.net/sourceforge/smartmontools/smartmontools-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Control and monitor storage systems using S.M.A.R.T."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/system-tools-depends/st/package.mk b/packages/addons/addon-depends/system-tools-depends/st/package.mk
index 0e4792e223..d12eefc8fc 100644
--- a/packages/addons/addon-depends/system-tools-depends/st/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/st/package.mk
@@ -13,8 +13,8 @@ PKG_LONGDESC="A simple terminal implementation for X"
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_MAKE_OPTS_TARGET="X11INC=$(get_build_dir libXft)/include \
-                      X11LIB=$(get_build_dir libXft)/.$TARGET_NAME/src/.libs"
+                      X11LIB=$(get_build_dir libXft)/.${TARGET_NAME}/src/.libs"
 
 pre_configure_target() {
-  LDFLAGS="-lXrender $LDFLAGS"
+  LDFLAGS="-lXrender ${LDFLAGS}"
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/strace/package.mk b/packages/addons/addon-depends/system-tools-depends/strace/package.mk
index 386d6c7a9e..0e3ea5a2d9 100644
--- a/packages/addons/addon-depends/system-tools-depends/strace/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/strace/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="5.10"
 PKG_SHA256="fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c"
 PKG_LICENSE="BSD"
 PKG_SITE="https://strace.io/"
-PKG_URL="https://strace.io/files/$PKG_VERSION/strace-$PKG_VERSION.tar.xz"
+PKG_URL="https://strace.io/files/${PKG_VERSION}/strace-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="strace is a diagnostic, debugging and instructional userspace utility"
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk b/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk
index 178ffa8525..92d70e301b 100644
--- a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0.12.01"
 PKG_SHA256="d354bbbb1500cfe043c761014dc9c3f62779747fafea8a19af94402327f6d3fc"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://kernel.ubuntu.com/~cking/stress-ng/"
-PKG_URL="https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-$PKG_VERSION.tar.xz"
+PKG_URL="https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain attr keyutils libaio libcap zlib"
 PKG_LONGDESC="stress-ng will stress test a computer system in various selectable ways"
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk
index b63a2aa2af..6d6397f1f7 100644
--- a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk
@@ -13,24 +13,24 @@ PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="+pic -sysroot -parallel"
 
 unpack() {
-  mkdir -p $PKG_BUILD/unrar lib
-  tar -xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz -C $PKG_BUILD/
-  cp -a $PKG_BUILD/unrar $PKG_BUILD/lib
+  mkdir -p ${PKG_BUILD}/unrar lib
+  tar -xf ${SOURCES}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz -C ${PKG_BUILD}/
+  cp -a ${PKG_BUILD}/unrar ${PKG_BUILD}/lib
 }
 
 make_target() {
-  make CXX="$CXX" \
-     CXXFLAGS="$TARGET_CXXFLAGS" \
-     RANLIB="$RANLIB" \
-     AR="$AR" \
-     STRIP="$STRIP" \
+  make CXX="${CXX}" \
+     CXXFLAGS="${TARGET_CXXFLAGS}" \
+     RANLIB="${RANLIB}" \
+     AR="${AR}" \
+     STRIP="${STRIP}" \
      -C unrar \
      -f makefile
 
-  make CXX="$CXX" \
-     CXXFLAGS="$TARGET_CXXFLAGS" \
-     RANLIB="$RANLIB" \
-     AR="$AR" \
+  make CXX="${CXX}" \
+     CXXFLAGS="${TARGET_CXXFLAGS}" \
+     RANLIB="${RANLIB}" \
+     AR="${AR}" \
      -C lib \
      -f makefile lib
 }
@@ -40,8 +40,8 @@ post_make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/include/unrar $INSTALL/usr/lib $INSTALL/usr/bin
-  cp -p lib/*.hpp $INSTALL/usr/include/unrar/
-  cp -p lib/libunrar.a $INSTALL/usr/lib/
-  cp -p unrar/unrar $INSTALL/usr/bin/
+  mkdir -p ${INSTALL}/usr/include/unrar ${INSTALL}/usr/lib ${INSTALL}/usr/bin
+  cp -p lib/*.hpp ${INSTALL}/usr/include/unrar/
+  cp -p lib/libunrar.a ${INSTALL}/usr/lib/
+  cp -p unrar/unrar ${INSTALL}/usr/bin/
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/vim/package.mk b/packages/addons/addon-depends/system-tools-depends/vim/package.mk
index 3a9bf7936a..88f5fdd603 100644
--- a/packages/addons/addon-depends/system-tools-depends/vim/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/vim/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="8.2.2293"
 PKG_SHA256="20f9bc8b170fd278a6f319fde0edf5698f2707a395ebaafa9b1de9327f5a0775"
 PKG_LICENSE="VIM"
 PKG_SITE="http://www.vim.org/"
-PKG_URL="https://github.com/vim/vim/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/vim/vim/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="Vim is a highly configurable text editor built to enable efficient text editing."
 PKG_BUILD_FLAGS="-sysroot"
@@ -34,7 +34,7 @@ PKG_MAKEINSTALL_OPTS_TARGET=VIMRTDIR=
 
 pre_configure_target() {
   cd ..
-  rm -rf .$TARGET_NAME
+  rm -rf .${TARGET_NAME}
 }
 
 make_target() {
@@ -42,12 +42,12 @@ make_target() {
 }
 
 pre_makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
 }
 
 post_makeinstall_target() {
   (
-  cd $INSTALL/storage/.kodi/addons/virtual.system-tools/data/vim
+  cd ${INSTALL}/storage/.kodi/addons/virtual.system-tools/data/vim
   rm -r doc tutor gvimrc_example.vim
   mv vimrc_example.vim vimrc
   )
diff --git a/packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk b/packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk
index 4ff188f4d5..6f7d45b98b 100644
--- a/packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk
+++ b/packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="2.2.1"
 PKG_SHA256="3a3167e57727bf1d2a7b4861f7c7b57a663f58b9cf68227762ed2fc64e8ea11f"
 PKG_LICENSE="BSD"
 PKG_SITE="http://miniupnp.free.fr"
-PKG_URL="http://miniupnp.free.fr/files/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://miniupnp.free.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="The MiniUPnP project offers software which supports the UPnP Internet Gateway Device (IGD) specifications"
 
diff --git a/packages/addons/addon-depends/tini/package.mk b/packages/addons/addon-depends/tini/package.mk
index 781880a896..ec5520e4dd 100644
--- a/packages/addons/addon-depends/tini/package.mk
+++ b/packages/addons/addon-depends/tini/package.mk
@@ -14,7 +14,7 @@ PKG_LONGDESC="Tini is a simplest init system."
 PKG_MAKE_OPTS_TARGET="tini-static"
 
 pre_configure_target(){
-  sed -i "s|@tini_VERSION_GIT@| - git.${PKG_VERSION}|" $PKG_BUILD/src/tiniConfig.h.in
+  sed -i "s|@tini_VERSION_GIT@| - git.${PKG_VERSION}|" ${PKG_BUILD}/src/tiniConfig.h.in
 }
 
 makeinstall_target() {
diff --git a/packages/addons/addon-depends/tntnet/package.mk b/packages/addons/addon-depends/tntnet/package.mk
index 3e4003025f..719fa228b6 100644
--- a/packages/addons/addon-depends/tntnet/package.mk
+++ b/packages/addons/addon-depends/tntnet/package.mk
@@ -20,7 +20,7 @@ PKG_CONFIGURE_OPTS_HOST="--disable-unittest \
                          --with-stressjob=no"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-unittest \
-                           --with-sysroot=$SYSROOT_PREFIX \
+                           --with-sysroot=${SYSROOT_PREFIX} \
                            --with-server=no \
                            --with-sdk=no \
                            --with-demos=no \
@@ -29,8 +29,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-unittest \
                            --with-stressjob=no"
 
 post_makeinstall_target() {
-  sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/tntnet-config
+  sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/tntnet-config
 
-  rm -rf $INSTALL/usr/bin
-  rm -rf $INSTALL/usr/share
+  rm -rf ${INSTALL}/usr/bin
+  rm -rf ${INSTALL}/usr/share
 }
diff --git a/packages/addons/addon-depends/tslib/package.mk b/packages/addons/addon-depends/tslib/package.mk
index af593b2016..36f74ff91c 100644
--- a/packages/addons/addon-depends/tslib/package.mk
+++ b/packages/addons/addon-depends/tslib/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.1"
 PKG_SHA256="fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/kergoth/tslib"
-PKG_URL="https://github.com/kergoth/tslib/releases/download/1.1/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/kergoth/tslib/releases/download/1.1/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain evtest"
 PKG_LONGDESC="Touchscreen access library with ts_uinput_touch daemon."
 PKG_TOOLCHAIN="autotools"
@@ -18,24 +18,24 @@ TSLIB_BUILD_STATIC="yes"  # no .so files (easy to manage)
 pre_configure_target() {
   local OPTS_MODULES=""
 
-  if [ "$TSLIB_BUILD_STATIC" = "yes" ]; then
+  if [ "${TSLIB_BUILD_STATIC}" = "yes" ]; then
     OPTS_MODULES="--enable-static --disable-shared"
-    for module in $TSLIB_MODULES_ENABLED; do
-      OPTS_MODULES="$OPTS_MODULES --enable-$module=static"
+    for module in ${TSLIB_MODULES_ENABLED}; do
+      OPTS_MODULES+=" --enable-${module}=static"
     done
   fi
 
-  for module in $TSLIB_MODULES_DISABLED; do
-    OPTS_MODULES="$OPTS_MODULES --disable-$module"
+  for module in ${TSLIB_MODULES_DISABLED}; do
+    OPTS_MODULES+=" --disable-${module}"
   done
 
-  PKG_CONFIGURE_OPTS_TARGET="$OPTS_MODULES \
+  PKG_CONFIGURE_OPTS_TARGET="${OPTS_MODULES} \
     --sysconfdir=/storage/.kodi/userdata/addon_data/service.touchscreen"
 }
 
 post_makeinstall_target() {
-  rm -fr $INSTALL/etc
-  rm -fr $INSTALL/storage
+  rm -fr ${INSTALL}/etc
+  rm -fr ${INSTALL}/storage
 
-  debug_strip $INSTALL/usr/bin
+  debug_strip ${INSTALL}/usr/bin
 }
diff --git a/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk b/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk
index fc2c34def4..dd9b7983e7 100644
--- a/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk
+++ b/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="4.1.6"
 PKG_SHA256="402e9a8df553c9cd2aff5d7a9758e9e5285bf3070c82539082864633db3deb83"
 PKG_LICENSE="MIT"
 PKG_SITE="https://libwebsockets.org"
-PKG_URL="https://github.com/warmcat/libwebsockets/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/warmcat/libwebsockets/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain openssl json-c libuv"
 PKG_LONGDESC="Library for implementing network protocols with a tiny footprint."
 
diff --git a/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk b/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk
index 029af8190b..a0e136f661 100644
--- a/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk
+++ b/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="6bb0a70a0dcb97d5457c1ef4a7ccce634ea419b0"
 PKG_SHA256="a5f375d28e52ff3f527fecb7968f3ede6bc2e128d1ad78537ab4f0f7844edb45"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/tvheadend"
-PKG_URL="https://github.com/tvheadend/dtv-scan-tables/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/tvheadend/dtv-scan-tables/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Digital TV scan tables, a fork from Tvh to support more recent tables."
 PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="-sysroot"
 
 makeinstall_target() {
-  make install DATADIR=$INSTALL/usr/share
+  make install DATADIR=${INSTALL}/usr/share
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-ddci2/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-ddci2/package.mk
index 829f904f3b..cd2711a47a 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-ddci2/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-ddci2/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="05dd98824092859afd2aa7a4996c8f258affd975"
 PKG_SHA256="b8ed2787e9140eb00a68397eaeb14862ba88a6e73480dc3220a098faffb14833"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/jasmin-j/vdr-plugin-ddci2"
-PKG_URL="https://github.com/jasmin-j/vdr-plugin-ddci2/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/jasmin-j/vdr-plugin-ddci2/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="Support for stand alone CI by Digital Devices."
@@ -14,8 +14,8 @@ PKG_TOOLCHAIN="manual"
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+  export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
 
   make \
     LIBDIR="." \
@@ -25,9 +25,9 @@ make_target() {
 
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
-  $STRIP libvdr-*.so*
+  cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
+  ${STRIP} libvdr-*.so*
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dummydevice/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dummydevice/package.mk
index 969279302b..bca3e14f02 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dummydevice/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dummydevice/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.0.0"
 PKG_SHA256="5c0049824415bd463d3abc728a3136ee064b60a37b5d3a1986cf282b0d757085"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.vdr-wiki.de/wiki/index.php/Dummydevice-plugin"
-PKG_URL="http://phivdr.dyndns.org/vdr/vdr-dummydevice/${PKG_NAME/-plugin/}-$PKG_VERSION.tgz"
+PKG_URL="http://phivdr.dyndns.org/vdr/vdr-dummydevice/${PKG_NAME/-plugin/}-${PKG_VERSION}.tgz"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="This plugin can be used to run vdr as recording server without any output devices."
@@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual"
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+  export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
 
   make \
     LIBDIR="." \
@@ -26,7 +26,7 @@ make_target() {
 
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
   cp --remove-destination ${LIB_NAME}.so ${LIB_NAME}.so.${VDR_APIVERSION}
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
index 64c4825c3e..01d79d4d95 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="197e7524e563923d4b86e74a121f7174373818d9"
 PKG_SHA256="6eee60d524c185f1f72c4413e79a80619934508b75aa27f213b2f481182ec6fb"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
-PKG_URL="https://github.com/manio/vdr-plugin-dvbapi/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/manio/vdr-plugin-dvbapi/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr libdvbcsa"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="VDR dvbapi plugin for use with OSCam"
@@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual"
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+  export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
 
   make \
     LIBDIR="." \
@@ -27,8 +27,8 @@ make_target() {
 
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk
index 177fc6680a..d3a50cdb66 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="c46be443988489780f993a47d23a42936b49d6c0"
 PKG_SHA256="08b343caa392bddefeb6e8cfe6f341b4e11e120046dce05961a335a06e9bee6c"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-eepg"
-PKG_URL="https://github.com/vdr-projects/vdr-plugin-eepg/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/vdr-projects/vdr-plugin-eepg/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="This plugin parses the Extended EPG data which is send by providers on their portal channels."
@@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual"
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+  export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
 
   make \
     LIBDIR="." \
@@ -26,8 +26,8 @@ make_target() {
 
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk
index 9cd2718dcf..a07cbb205b 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="354f28b0112ba27f08f6509243b410899f74b6ed"
 PKG_SHA256="15bd73116f3bda9afc274bee97eff829b98f38b13043be32d7bb7f81af294715"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-epgfixer"
-PKG_URL="https://github.com/vdr-projects/vdr-plugin-epgfixer/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/vdr-projects/vdr-plugin-epgfixer/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr pcre"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="Plugin for modifying EPG data using regular expressions."
@@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual"
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+  export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
 
   make \
     LIBDIR="." \
@@ -26,8 +26,8 @@ make_target() {
 
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk
index 82ac3e881e..3b459bff61 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="770de32f1908b1f9c60f66bf288a4c8a03f97d52"
 PKG_SHA256="8b6144ee3d22b0c13ba81be94920b421b05fd9b921dfe8245ed582db407acac8"
 PKG_LICENSE="GPL"
 PKG_SITE="http://winni.vdr-developer.org/epgsearch/"
-PKG_URL="https://github.com/vdr-projects/vdr-plugin-epgsearch/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/vdr-projects/vdr-plugin-epgsearch/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="EPGSearch is a plugin for the Video-Disc-Recorder (VDR)."
@@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual"
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+  export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
 
   make \
     LIBDIR="." \
@@ -26,8 +26,8 @@ make_target() {
 
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk
index cd4aac24a2..af90a2793b 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="f7369c9578c1437c7a19cf11e21424844f42a341"
 PKG_SHA256="9045ec034182d19535ab3478152ef6a7fd2640478c78d697d2f2c93f11482316"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/"
-PKG_URL="https://github.com/rofafor/vdr-plugin-iptv/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/rofafor/vdr-plugin-iptv/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr curl"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)"
@@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual"
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+  export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
 
   make \
     LIBDIR="." \
@@ -26,8 +26,8 @@ make_target() {
 
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk
index b03e870457..1430fed11e 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="e582514ede475574842b44ca6792335ff141172d"
 PKG_SHA256="74deb2ca43ffb5779b3f9ff6f34c8b53898a226fcf92605d7ede0401cb62601c"
 PKG_LICENSE="GPL"
 PKG_SITE="http://live.vdr-developer.org/en/index.php"
-PKG_URL="https://github.com/vdr-projects/vdr-plugin-live/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/vdr-projects/vdr-plugin-live/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr tntnet pcre:host pcre"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="Allows a comfortable operation of VDR and some of its plugins trough a web interface."
@@ -15,18 +15,18 @@ PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="+pic -parallel"
 
 pre_configure_target() {
-  export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib/iconv"
+  export LDFLAGS="${LDFLAGS} -L${SYSROOT_PREFIX}/usr/lib/iconv"
 }
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  make VDRDIR=$VDR_DIR \
+  make VDRDIR=${VDR_DIR} \
     LIBDIR="." \
     LOCALEDIR="./locale"
 
-  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk
index 0cf91616b8..69c221ae18 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk
@@ -14,13 +14,13 @@ PKG_LONGDESC="Allows to access many internals of the VDR via a restful API."
 PKG_TOOLCHAIN="manual"
 
 pre_build_target() {
-  cp $(get_build_dir vdr-plugin-wirbelscan)/wirbelscan_services.h $PKG_BUILD/wirbelscan/
+  cp $(get_build_dir vdr-plugin-wirbelscan)/wirbelscan_services.h ${PKG_BUILD}/wirbelscan/
 }
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+  export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
 
   make \
     LIBDIR="." \
@@ -31,8 +31,8 @@ make_target() {
 
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk
index 5721010085..26dd05d612 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="e06dd3942a17bf622f625b6e51f24e95cfa3877e"
 PKG_SHA256="4f9d5092107d34b2036d56f858a0a744a21f38df8bf6698532c8dcad0157f316"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/pipelka/roboTV"
-PKG_URL="https://github.com/pipelka/vdr-plugin-robotv/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/pipelka/vdr-plugin-robotv/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr avahi"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="RoboTV is a Android TV based frontend for VDR."
@@ -14,15 +14,15 @@ PKG_TOOLCHAIN="cmake"
 
 pre_configure_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-  export VDRDIR=$VDR_DIR
+  export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
+  export VDRDIR=${VDR_DIR}
 }
 
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $PKG_BUILD/.$TARGET_NAME/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination ${PKG_BUILD}/.${TARGET_NAME}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
index 1e268da334..cfd7bda747 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="a7625c028c460b8350a023db495e2b6b0bc93607"
 PKG_SHA256="49955757df436393b1ae3ef1ce05a13ea80d5de87dd1222cad9e71045e3ab26e"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
-PKG_URL="https://github.com/rofafor/vdr-plugin-satip/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/rofafor/vdr-plugin-satip/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr curl tinyxml"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="This is an SAT>IP plugin for the Video Disk Recorder (VDR)."
@@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual"
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+  export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
 
   make \
     SATIP_USE_TINYXML=1 \
@@ -27,8 +27,8 @@ make_target() {
 
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk
index 0d23c2c52f..25872c30c1 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="e2a9b979d3fb92967c7a6a8221e674eb7e55c813"
 PKG_SHA256="adcc08ac19cf98122576bedf63be3396d8b81ee4196c00df0e25c9fb8b7e11b8"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-streamdev"
-PKG_URL="https://github.com/vdr-projects/vdr-plugin-streamdev/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/vdr-projects/vdr-plugin-streamdev/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr openssl"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="This PlugIn is a VDR implementation of Video Transfer and a basic HTTP Streaming Protocol."
@@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual"
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+  export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
 
   make \
     LIBDIR="." \
@@ -26,8 +26,8 @@ make_target() {
 
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
-  cp --remove-destination $PKG_BUILD/server/${LIB_NAME}-server.so $PKG_BUILD/server/${LIB_NAME}-server.so.${VDR_APIVERSION}
-  cp --remove-destination $PKG_BUILD/client/${LIB_NAME}-client.so $PKG_BUILD/client/${LIB_NAME}-client.so.${VDR_APIVERSION}
+  cp --remove-destination ${PKG_BUILD}/server/${LIB_NAME}-server.so ${PKG_BUILD}/server/${LIB_NAME}-server.so.${VDR_APIVERSION}
+  cp --remove-destination ${PKG_BUILD}/client/${LIB_NAME}-client.so ${PKG_BUILD}/client/${LIB_NAME}-client.so.${VDR_APIVERSION}
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk
index 1cdf7eaf1a..d959671963 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="908684b58a3ebd4a447bc4b0a82b0bd8059bf605"
 PKG_SHA256="6c39a2e9854632274cec2b11e4eaaea9edc4095856941672f40d0633ece506df"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/mdre77/vdr-plugin-vnsiserver"
-PKG_URL="https://github.com/mdre77/vdr-plugin-vnsiserver/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/mdre77/vdr-plugin-vnsiserver/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="VDR plugin to handle Kodi clients."
@@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual"
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+  export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}
+  export CPLUS_INCLUDE_PATH=${VDR_DIR}/include
 
   make \
     LIBDIR="." \
@@ -26,8 +26,8 @@ make_target() {
 
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h)
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk
index 5070a75a24..82fd2b0811 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2018.11.04"
 PKG_SHA256="62c2848aefdb768c165310f70b3746665f57b96a95ebae96761febbb07e942e3"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/wirbelscan/index2.html"
-PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-$PKG_VERSION.tgz"
+PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-${PKG_VERSION}.tgz"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="Performs a channel scans for DVB-T, DVB-C and DVB-S"
@@ -16,7 +16,7 @@ PKG_BUILD_FLAGS="+pic"
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  make VDRDIR=$VDR_DIR \
+  make VDRDIR=${VDR_DIR} \
     LIBDIR="." \
     LOCALEDIR="./locale"
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk
index b1cc143419..a2d726b09b 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="0.0.2"
 PKG_SHA256="178c5768dd47355a42409a2cb2629f0762da1297865e3a84963684649145cb13"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/wirbelscancontrol/index2.html"
-PKG_URL="http://wirbel.htpc-forum.de/wirbelscancontrol/${PKG_NAME/-plugin/}-$PKG_VERSION.tgz"
+PKG_URL="http://wirbel.htpc-forum.de/wirbelscancontrol/${PKG_NAME/-plugin/}-${PKG_VERSION}.tgz"
 PKG_DEPENDS_TARGET="toolchain vdr vdr-plugin-wirbelscan"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="Adds menu entry for wirbelscan at VDR."
@@ -16,12 +16,12 @@ PKG_BUILD_FLAGS="+pic"
 
 pre_build_target() {
   WIRBELSCAN_DIR=$(get_build_dir vdr-plugin-wirbelscan)
-  ln -sf $WIRBELSCAN_DIR/wirbelscan_services.h $PKG_BUILD
+  ln -sf ${WIRBELSCAN_DIR}/wirbelscan_services.h ${PKG_BUILD}
 }
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  make VDRDIR=$VDR_DIR \
+  make VDRDIR=${VDR_DIR} \
     LIBDIR="." \
     LOCALEDIR="./locale"
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk
index 382de18c5b..8830133152 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk
@@ -15,13 +15,13 @@ PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="+pic"
 
 pre_configure_target() {
-  export CXXFLAGS="$CXXFLAGS -Wno-narrowing"
-  export LIBS="-L$SYSROOT_PREFIX/usr/lib/iconv -lpcre -lpcrecpp -lssl -lcrypto -lbz2"
+  export CXXFLAGS="${CXXFLAGS} -Wno-narrowing"
+  export LIBS="-L${SYSROOT_PREFIX}/usr/lib/iconv -lpcre -lpcrecpp -lssl -lcrypto -lbz2"
 }
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  make VDRDIR=$VDR_DIR \
+  make VDRDIR=${VDR_DIR} \
     LIBDIR="." \
     LOCALEDIR="./locale"
 }
@@ -30,5 +30,5 @@ post_make_target() {
   cd dist/epgdata2xmltv
   make -j1
   cd -
-  $STRIP dist/epgdata2xmltv/epgdata2xmltv
+  ${STRIP} dist/epgdata2xmltv/epgdata2xmltv
 }
diff --git a/packages/addons/addon-depends/vdr/package.mk b/packages/addons/addon-depends/vdr/package.mk
index 84559abd73..4477b1b8b3 100644
--- a/packages/addons/addon-depends/vdr/package.mk
+++ b/packages/addons/addon-depends/vdr/package.mk
@@ -8,17 +8,17 @@ PKG_VERSION="2.4.6"
 PKG_SHA256="c8993babf2a878a0fba84558de1e35f042c3c66f7c1ec569eea00a3af1014e4b"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvdr.de"
-PKG_URL="http://ftp.tvdr.de/vdr-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftp.tvdr.de/vdr-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain bzip2 fontconfig freetype libcap libiconv libjpeg-turbo"
 PKG_LONGDESC="A DVB TV server application."
 PKG_TOOLCHAIN="manual"
 
 post_unpack() {
-  rm -rf $PKG_BUILD/PLUGINS/src/skincurses
+  rm -rf ${PKG_BUILD}/PLUGINS/src/skincurses
 }
 
 pre_configure_target() {
-  export LDFLAGS="$(echo $LDFLAGS | sed -e "s|-Wl,--as-needed||") -L$SYSROOT_PREFIX/usr/lib/iconv"
+  export LDFLAGS="$(echo ${LDFLAGS} | sed -e "s|-Wl,--as-needed||") -L${SYSROOT_PREFIX}/usr/lib/iconv"
 }
 
 pre_make_target() {
diff --git a/packages/addons/addon-depends/whois/package.mk b/packages/addons/addon-depends/whois/package.mk
index dbed07326e..fc46410ae0 100644
--- a/packages/addons/addon-depends/whois/package.mk
+++ b/packages/addons/addon-depends/whois/package.mk
@@ -17,5 +17,5 @@ make_target() {
 }
 
 makeinstall_target() {
-  make install BASEDIR=$INSTALL
+  make install BASEDIR=${INSTALL}
 }
diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk
index b59736a364..448c98db8f 100644
--- a/packages/addons/browser/chrome/package.mk
+++ b/packages/addons/browser/chrome/package.mk
@@ -28,16 +28,16 @@ make_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/{bin,config,gdk-pixbuf-modules,lib}
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,config,gdk-pixbuf-modules,lib}
 
   # config
-  cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config
+  cp -P ${PKG_DIR}/config/* ${ADDON_BUILD}/${PKG_ADDON_ID}/config
 
   # gdk-pixbuf modules
-  cp -PL $(get_install_dir gdk-pixbuf)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/* $ADDON_BUILD/$PKG_ADDON_ID/gdk-pixbuf-modules
+  cp -PL $(get_install_dir gdk-pixbuf)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/* ${ADDON_BUILD}/${PKG_ADDON_ID}/gdk-pixbuf-modules
 
   # unclutter
-  cp -P $(get_install_dir unclutter)/usr/bin/unclutter $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $(get_install_dir unclutter)/usr/bin/unclutter ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
   # libs
   cp -PL $(get_install_dir atk)/usr/lib/libatk-1.0.so.0 \
@@ -59,7 +59,7 @@ addon() {
          $(get_install_dir libxss)/usr/lib/libXss.so.1 \
          $(get_install_dir chrome-libXtst)/usr/lib/libXtst.so.6 \
          $(get_install_dir pango)/usr/lib/{libpangocairo-1.0.so.0,libpango-1.0.so.0,libpangoft2-1.0.so.0} \
-         $ADDON_BUILD/$PKG_ADDON_ID/lib
+         ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
 }
 
 post_install_addon() {
diff --git a/packages/addons/driver/hdhomerun/package.mk b/packages/addons/driver/hdhomerun/package.mk
index 924d5678bd..f9840ddd9d 100644
--- a/packages/addons/driver/hdhomerun/package.mk
+++ b/packages/addons/driver/hdhomerun/package.mk
@@ -19,7 +19,7 @@ PKG_ADDON_NAME="HDHomeRun"
 PKG_ADDON_TYPE="xbmc.python.script"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/
-  cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
-  cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config/
+  cp -P ${PKG_DIR}/config/* ${ADDON_BUILD}/${PKG_ADDON_ID}/config/
+  cp -P ${PKG_DIR}/settings-default.xml ${ADDON_BUILD}/${PKG_ADDON_ID}/
 }
diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk
index 7418095100..cc628e50fd 100644
--- a/packages/addons/driver/sundtek-mediatv/package.mk
+++ b/packages/addons/driver/sundtek-mediatv/package.mk
@@ -20,10 +20,10 @@ PKG_ADDON_NAME="Sundtek MediaTV"
 PKG_ADDON_TYPE="xbmc.service"
 
 make_target() {
-  mkdir -p $PKG_BUILD
-  cd $PKG_BUILD
+  mkdir -p ${PKG_BUILD}
+  cd ${PKG_BUILD}
 
-  case $TARGET_ARCH in
+  case ${TARGET_ARCH} in
     x86_64)
       INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz"
       ;;
@@ -35,7 +35,7 @@ make_target() {
       ;;
   esac
 
-  wget -O installer.tar.gz $INSTALLER_URL
+  wget -O installer.tar.gz ${INSTALLER_URL}
 
   tar -xzf installer.tar.gz
 
@@ -49,10 +49,10 @@ make_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/
-  cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
-  cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/
-  cp -Pa $PKG_BUILD/opt/bin $ADDON_BUILD/$PKG_ADDON_ID/
-  cp -Pa $PKG_BUILD/opt/lib $ADDON_BUILD/$PKG_ADDON_ID/
-  cp $PKG_BUILD/version.used $ADDON_BUILD/$PKG_ADDON_ID/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config/
+  cp -P ${PKG_DIR}/config/* ${ADDON_BUILD}/${PKG_ADDON_ID}/config/
+  cp -P ${PKG_DIR}/settings-default.xml ${ADDON_BUILD}/${PKG_ADDON_ID}/
+  cp -Pa ${PKG_BUILD}/opt/bin ${ADDON_BUILD}/${PKG_ADDON_ID}/
+  cp -Pa ${PKG_BUILD}/opt/lib ${ADDON_BUILD}/${PKG_ADDON_ID}/
+  cp ${PKG_BUILD}/version.used ${ADDON_BUILD}/${PKG_ADDON_ID}/
 }
diff --git a/packages/addons/libraries/adafruit-libraries/package.mk b/packages/addons/libraries/adafruit-libraries/package.mk
index 7b74cc9cda..c15e6d190a 100644
--- a/packages/addons/libraries/adafruit-libraries/package.mk
+++ b/packages/addons/libraries/adafruit-libraries/package.mk
@@ -20,22 +20,22 @@ PKG_ADDON_TYPE="xbmc.python.module"
 PKG_ADDON_REQUIRES="virtual.rpi-tools:8.0.102"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-    cp -PR $(get_build_dir Adafruit_Python_ADS1x15)/Adafruit_ADS1x15           $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_ADXL345)/Adafruit_ADXL345           $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_BMP)/Adafruit_BMP                   $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_CharLCD)/Adafruit_CharLCD           $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_DHT)/build/lib/Adafruit_DHT         $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_GPIO)/Adafruit_GPIO                 $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_LED_Backpack)/Adafruit_LED_Backpack $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_LSM303)/Adafruit_LSM303             $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_MCP3008)/Adafruit_MCP3008           $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_MCP4725)/Adafruit_MCP4725           $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_PCA9685)/Adafruit_PCA9685           $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_PureIO)/Adafruit_PureIO             $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_SI1145)/SI1145                      $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_SSD1306)/Adafruit_SSD1306           $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_TCS34725)/Adafruit_TCS34725         $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_VCNL40xx)/Adafruit_VCNL40xx         $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir Adafruit_Python_WS2801)/Adafruit_WS2801             $ADDON_BUILD/$PKG_ADDON_ID/lib/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+    cp -PR $(get_build_dir Adafruit_Python_ADS1x15)/Adafruit_ADS1x15           ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_ADXL345)/Adafruit_ADXL345           ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_BMP)/Adafruit_BMP                   ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_CharLCD)/Adafruit_CharLCD           ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_DHT)/build/lib/Adafruit_DHT         ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_GPIO)/Adafruit_GPIO                 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_LED_Backpack)/Adafruit_LED_Backpack ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_LSM303)/Adafruit_LSM303             ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_MCP3008)/Adafruit_MCP3008           ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_MCP4725)/Adafruit_MCP4725           ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_PCA9685)/Adafruit_PCA9685           ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_PureIO)/Adafruit_PureIO             ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_SI1145)/SI1145                      ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_SSD1306)/Adafruit_SSD1306           ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_TCS34725)/Adafruit_TCS34725         ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_VCNL40xx)/Adafruit_VCNL40xx         ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+    cp -PR $(get_build_dir Adafruit_Python_WS2801)/Adafruit_WS2801             ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
 }
diff --git a/packages/addons/repository/repository.linuxserver.docker/package.mk b/packages/addons/repository/repository.linuxserver.docker/package.mk
index 800d057faf..1a16c48793 100644
--- a/packages/addons/repository/repository.linuxserver.docker/package.mk
+++ b/packages/addons/repository/repository.linuxserver.docker/package.mk
@@ -19,12 +19,12 @@ PKG_ADDON_NAME="LinuxServer.io Repository"
 PKG_ADDON_TYPE="xbmc.addon.repository"
 
 make_target() {
-  sed -e "s|@PKG_VERSION@|$PKG_VERSION|g" \
-      -e "s|@PKG_REV@|$PKG_REV|g" \
+  sed -e "s|@PKG_VERSION@|${PKG_VERSION}|g" \
+      -e "s|@PKG_REV@|${PKG_REV}|g" \
       -i addon.xml
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-  cp -R $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}
+  cp -R ${PKG_BUILD}/* ${ADDON_BUILD}/${PKG_ADDON_ID}
 }
diff --git a/packages/addons/script/driverselect/package.mk b/packages/addons/script/driverselect/package.mk
index 371ebcee46..01447cb777 100644
--- a/packages/addons/script/driverselect/package.mk
+++ b/packages/addons/script/driverselect/package.mk
@@ -8,7 +8,7 @@ PKG_REV="100"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://libreelec.tv"
-PKG_URL="https://github.com/b-jesch/script.program.driverselect/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/b-jesch/script.program.driverselect/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="script.program"
 PKG_SHORTDESC="script.program.driverselect"
diff --git a/packages/addons/script/script.config.vdr/package.mk b/packages/addons/script/script.config.vdr/package.mk
index 77eab52076..c240128d9e 100644
--- a/packages/addons/script/script.config.vdr/package.mk
+++ b/packages/addons/script/script.config.vdr/package.mk
@@ -9,7 +9,7 @@ PKG_REV="104"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://libreelec.tv"
-PKG_URL="https://github.com/LibreELEC/script.config.vdr/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/LibreELEC/script.config.vdr/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="xmlstarlet:host p7zip:host"
 PKG_SECTION=""
 PKG_SHORTDESC="script.config.vdr"
@@ -20,13 +20,13 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="dummy"
 
 make_target() {
-  sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
+  sed -e "s|@ADDON_VERSION@|${ADDON_VERSION}|g" \
       -i addon.xml
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-  cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID
-  cp $PKG_DIR/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID
-  cp $PKG_DIR/icon/icon.png $ADDON_BUILD/$PKG_ADDON_ID/resources
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}
+  cp -PR ${PKG_BUILD}/* ${ADDON_BUILD}/${PKG_ADDON_ID}
+  cp ${PKG_DIR}/changelog.txt ${ADDON_BUILD}/${PKG_ADDON_ID}
+  cp ${PKG_DIR}/icon/icon.png ${ADDON_BUILD}/${PKG_ADDON_ID}/resources
 }
diff --git a/packages/addons/service/boblightd/package.mk b/packages/addons/service/boblightd/package.mk
index 2336ec6129..1cf66f1f34 100644
--- a/packages/addons/service/boblightd/package.mk
+++ b/packages/addons/service/boblightd/package.mk
@@ -8,53 +8,53 @@ PKG_REV="101"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libusb"
 PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="Boblight: an AmbiLight controller"
-PKG_LONGDESC="Boblight($PKG_VERSION) is an opensource AmbiLight implementation."
+PKG_LONGDESC="Boblight(${PKG_VERSION}) is an opensource AmbiLight implementation."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Boblight"
 PKG_ADDON_TYPE="xbmc.service"
 PKG_TOOLCHAIN="autotools"
 
-if [ "$DISPLAYSERVER" = "x11" ] ; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXext libXrender"
+if [ "${DISPLAYSERVER}" = "x11" ]; then
+  PKG_DEPENDS_TARGET+=" libX11 libXext libXrender"
 fi
 
-if [ "$OPENGL_SUPPORT" = "yes" ] ; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mesa glu"
+if [ "${OPENGL_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" mesa glu"
 fi
 
-if [ "$OPENGL" = "no" ]; then
+if [ "${OPENGL}" = "no" ]; then
   EXTRAOPTS="--without-opengl"
 fi
 
-if [ ! "$DISPLAYSERVER" = "x11" ] ; then
-  EXTRAOPTS="$EXTRAOPTS --without-x11"
+if [ ! "${DISPLAYSERVER}" = "x11" ]; then
+  EXTRAOPTS+=" --without-x11"
 fi
 
-PKG_CONFIGURE_OPTS_TARGET="$EXTRAOPTS --without-portaudio"
+PKG_CONFIGURE_OPTS_TARGET="${EXTRAOPTS} --without-portaudio"
 
 makeinstall_target() {
   : # nothing to do here
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $PKG_BUILD/.$TARGET_NAME/src/.libs/libboblight.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+  cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/.libs/libboblight.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/.$TARGET_NAME/src/boblightd $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/.$TARGET_NAME/src/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin
-  if [ "$DISPLAYSERVER" = "x11" ] ; then
-    cp -P $PKG_BUILD/.$TARGET_NAME/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblightd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblight-constant ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  if [ "${DISPLAYSERVER}" = "x11" ]; then
+    cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblight-X11 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
   fi
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
-  cp -R $PKG_DIR/config/boblight.conf $ADDON_BUILD/$PKG_ADDON_ID/config
-  if [ "$DISPLAYSERVER" = "x11" ] ; then
-    cp -R $PKG_DIR/config/boblight.X11.sample $ADDON_BUILD/$PKG_ADDON_ID/config
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config
+  cp -R ${PKG_DIR}/config/boblight.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config
+  if [ "${DISPLAYSERVER}" = "x11" ]; then
+    cp -R ${PKG_DIR}/config/boblight.X11.sample ${ADDON_BUILD}/${PKG_ADDON_ID}/config
   fi
 }
diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk
index ac4b00933c..9f87421aac 100644
--- a/packages/addons/service/docker/package.mk
+++ b/packages/addons/service/docker/package.mk
@@ -37,7 +37,7 @@ configure_target() {
   PKG_GOPATH_CLI=${GOPATH}_cli
   export GOPATH=${PKG_GOPATH_CLI}:${PKG_GOPATH_ENGINE}
 
-  export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC"
+  export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld ${CC}"
 
   mkdir -p ${PKG_GOPATH_ENGINE}
   mkdir -p ${PKG_GOPATH_CLI}
@@ -74,11 +74,11 @@ configure_target() {
   mkdir -p ${PKG_GOPATH_CLI}/src/github.com/docker/docker/builder
   cp -rf   ${PKG_ENGINE_PATH}/builder/* ${PKG_GOPATH_CLI}/src/github.com/docker/docker/builder
 
-  if [ ! -L ${PKG_GOPATH_ENGINE}/src/github.com/docker/docker ];then
+  if [ ! -L ${PKG_GOPATH_ENGINE}/src/github.com/docker/docker ]; then
     ln -fs  ${PKG_ENGINE_PATH} ${PKG_GOPATH_ENGINE}/src/github.com/docker/docker
   fi
 
-  if [ ! -L ${PKG_GOPATH_CLI}/src/github.com/docker/cli ];then
+  if [ ! -L ${PKG_GOPATH_CLI}/src/github.com/docker/cli ]; then
     ln -fs ${PKG_CLI_PATH} ${PKG_GOPATH_CLI}/src/github.com/docker/cli
   fi
 
@@ -95,8 +95,8 @@ configure_target() {
 make_target() {
   mkdir -p bin
   PKG_CLI_FLAGS="-X 'github.com/docker/cli/cli/version.Version=${VERSION}'"
-  PKG_CLI_FLAGS="${PKG_CLI_FLAGS} -X 'github.com/docker/cli/cli/version.GitCommit=${GITCOMMIT}'"
-  PKG_CLI_FLAGS="${PKG_CLI_FLAGS} -X 'github.com/docker/cli/cli/version.BuildTime=${BUILDTIME}'"
+  PKG_CLI_FLAGS+=" -X 'github.com/docker/cli/cli/version.GitCommit=${GITCOMMIT}'"
+  PKG_CLI_FLAGS+=" -X 'github.com/docker/cli/cli/version.BuildTime=${BUILDTIME}'"
   ${GOLANG} build -v -o bin/docker -a -tags "${PKG_DOCKER_BUILDTAGS}" -ldflags "${LDFLAGS} ${PKG_CLI_FLAGS}" ./components/cli/cmd/docker
   ${GOLANG} build -v -o bin/dockerd -a -tags "${PKG_DOCKER_BUILDTAGS}" -ldflags "${LDFLAGS}" ./components/engine/cmd/dockerd
 }
diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk
index b898846381..db1dd799ba 100644
--- a/packages/addons/service/hyperion/package.mk
+++ b/packages/addons/service/hyperion/package.mk
@@ -10,12 +10,12 @@ PKG_REV="112"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hyperion-project/hyperion"
-PKG_URL="https://github.com/hyperion-project/hyperion/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/hyperion-project/hyperion/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 libusb qtbase protobuf rpi_ws281x"
 PKG_DEPENDS_UNPACK="rpi_ws281x"
 PKG_SECTION="service"
 PKG_SHORTDESC="Hyperion: an AmbiLight controller"
-PKG_LONGDESC="Hyperion($PKG_VERSION_DATE) is an modern opensource AmbiLight implementation."
+PKG_LONGDESC="Hyperion(${PKG_VERSION_DATE}) is an modern opensource AmbiLight implementation."
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_IS_ADDON="yes"
@@ -26,16 +26,16 @@ PKG_DISPMANX_SUPPORT="-DENABLE_DISPMANX=OFF"
 PKG_FB_SUPPORT="-DENABLE_FB=ON"
 PKG_X11_SUPPORT="-DENABLE_X11=OFF"
 
-if [ "$DISPLAYSERVER" = "x11" ]; then
+if [ "${DISPLAYSERVER}" = "x11" ]; then
   PKG_DEPENDS_TARGET+=" xorg-server xrandr"
   PKG_X11_SUPPORT="-DENABLE_X11=ON"
 fi
 
 PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
-                       -DHYPERION_VERSION_ID="$PKG_VERSION" \
+                       -DHYPERION_VERSION_ID="${PKG_VERSION}" \
                        -DENABLE_AMLOGIC=OFF \
-                       $PKG_DISPMANX_SUPPORT \
-                       $PKG_FB_SUPPORT \
+                       ${PKG_DISPMANX_SUPPORT} \
+                       ${PKG_FB_SUPPORT} \
                        -DENABLE_OSX=OFF \
                        -DUSE_SYSTEM_PROTO_LIBS=ON \
                        -DENABLE_SPIDEV=ON \
@@ -43,13 +43,13 @@ PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
                        -DENABLE_V4L2=ON \
                        -DENABLE_WS2812BPWM=OFF \
                        -DENABLE_WS281XPWM=ON \
-                       $PKG_X11_SUPPORT \
+                       ${PKG_X11_SUPPORT} \
                        -DENABLE_QT5=ON \
                        -DENABLE_TESTS=OFF \
                        -Wno-dev"
 
 pre_build_target() {
-  cp -a $(get_build_dir rpi_ws281x)/* $PKG_BUILD/dependencies/external/rpi_ws281x
+  cp -a $(get_build_dir rpi_ws281x)/* ${PKG_BUILD}/dependencies/external/rpi_ws281x
 }
 
 pre_configure_target() {
@@ -57,9 +57,9 @@ pre_configure_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp $PKG_INSTALL/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp ${PKG_INSTALL}/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
-  cp -PR $PKG_INSTALL/usr/share/hyperion/webconfig $ADDON_BUILD/$PKG_ADDON_ID
-  cp -PR $PKG_INSTALL/usr/share/hyperion/effects $ADDON_BUILD/$PKG_ADDON_ID
+  cp -PR ${PKG_INSTALL}/usr/share/hyperion/webconfig ${ADDON_BUILD}/${PKG_ADDON_ID}
+  cp -PR ${PKG_INSTALL}/usr/share/hyperion/effects ${ADDON_BUILD}/${PKG_ADDON_ID}
 }
diff --git a/packages/addons/service/inadyn/package.mk b/packages/addons/service/inadyn/package.mk
index acc2114c11..975d8fcaae 100644
--- a/packages/addons/service/inadyn/package.mk
+++ b/packages/addons/service/inadyn/package.mk
@@ -8,11 +8,11 @@ PKG_REV="106"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://troglobit.com/inadyn.html"
-PKG_URL="https://github.com/troglobit/inadyn/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/troglobit/inadyn/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libconfuse openssl"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Inadyn: a small and simple Dynamic Domain Name System client"
-PKG_LONGDESC="Inadyn ($PKG_VERSION) is a small and simple Dynamic Domain Name System (DDNS) client with HTTPS support. It is commonly available in many GNU/Linux distributions, used in off-the-shelf routers and Internet gateways to automate the task of keeping your DNS record up to date with any IP address changes from your ISP. It can also be used in installations with redundant (backup) connections to the Internet."
+PKG_LONGDESC="Inadyn (${PKG_VERSION}) is a small and simple Dynamic Domain Name System (DDNS) client with HTTPS support. It is commonly available in many GNU/Linux distributions, used in off-the-shelf routers and Internet gateways to automate the task of keeping your DNS record up to date with any IP address changes from your ISP. It can also be used in installations with redundant (backup) connections to the Internet."
 PKG_TOOLCHAIN="autotools"
 
 PKG_IS_ADDON="yes"
@@ -27,6 +27,6 @@ makeinstall_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/.$TARGET_NAME/src/inadyn $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp ${PKG_BUILD}/.${TARGET_NAME}/src/inadyn ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
diff --git a/packages/addons/service/lcdd/package.mk b/packages/addons/service/lcdd/package.mk
index 03d5c10756..2b48dceb6f 100644
--- a/packages/addons/service/lcdd/package.mk
+++ b/packages/addons/service/lcdd/package.mk
@@ -9,11 +9,11 @@ PKG_REV="108"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://lcdproc.org/"
-PKG_URL="https://github.com/lcdproc/lcdproc/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/lcdproc/lcdproc/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain freetype libftdi1 libhid libugpio libusb ncurses serdisplib"
 PKG_SECTION="service"
 PKG_SHORTDESC="LCDproc: Software to display system information from your Linux/*BSD box on a LCD"
-PKG_LONGDESC="LCDproc ($PKG_VERSION) is a piece of software that displays real-time system information from your Linux/*BSD box on a LCD. The server supports several serial devices: Matrix Orbital, Crystal Fontz, Bayrad, LB216, LCDM001 (kernelconcepts.de), Wirz-SLI, Cwlinux(.com) and PIC-an-LCD; and some devices connected to the LPT port: HD44780, STV5730, T6963, SED1520 and SED1330. Various clients are available that display things like CPU load, system load, memory usage, uptime, and a lot more."
+PKG_LONGDESC="LCDproc (${PKG_VERSION}) is a piece of software that displays real-time system information from your Linux/*BSD box on a LCD. The server supports several serial devices: Matrix Orbital, Crystal Fontz, Bayrad, LB216, LCDM001 (kernelconcepts.de), Wirz-SLI, Cwlinux(.com) and PIC-an-LCD; and some devices connected to the LPT port: HD44780, STV5730, T6963, SED1520 and SED1330. Various clients are available that display things like CPU load, system load, memory usage, uptime, and a lot more."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="-parallel"
 
@@ -21,7 +21,7 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="LCDproc"
 PKG_ADDON_TYPE="xbmc.service"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=$SYSROOT_PREFIX/usr \
+PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=${SYSROOT_PREFIX}/usr \
                            --enable-libusb \
                            --enable-libftdi \
                            --disable-libX11 \
@@ -30,21 +30,21 @@ PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=$SYSROOT_PREFIX/usr \
                            --enable-drivers=all"
 
 pre_configure_target() {
-  CFLAGS="$CFLAGS -O3"
+  CFLAGS+=" -O3"
 }
 
 addon() {
-  drivers="none|$(cat $PKG_BUILD/.$TARGET_NAME/config.log | sed -n "s|^DRIVERS=' \(.*\)'|\1|p" | sed "s|.so||g" | tr ' ' '|')"
+  drivers="none|$(cat ${PKG_BUILD}/.${TARGET_NAME}/config.log | sed -n "s|^DRIVERS=' \(.*\)'|\1|p" | sed "s|.so||g" | tr ' ' '|')"
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config
 
-  cp -PR $PKG_DIR/resources $ADDON_BUILD/$PKG_ADDON_ID
+  cp -PR ${PKG_DIR}/resources ${ADDON_BUILD}/${PKG_ADDON_ID}
 
-  cp -PR $PKG_INSTALL/etc/LCDd.conf $ADDON_BUILD/$PKG_ADDON_ID/config/
-  cp -PR $PKG_INSTALL/usr/lib       $ADDON_BUILD/$PKG_ADDON_ID/lib/
-  cp -PR $PKG_INSTALL/usr/sbin      $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  cp -PR ${PKG_INSTALL}/etc/LCDd.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config/
+  cp -PR ${PKG_INSTALL}/usr/lib       ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+  cp -PR ${PKG_INSTALL}/usr/sbin      ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 
-  cp -L $(get_install_dir serdisplib)/usr/lib/libserdisp.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib/
+  cp -L $(get_install_dir serdisplib)/usr/lib/libserdisp.so.2 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
 
   sed -e "s|^DriverPath=.*$|DriverPath=/storage/.kodi/addons/service.lcdd/lib/lcdproc/|" \
       -e "s|^#Foreground=.*$|Foreground=no|" \
@@ -53,13 +53,13 @@ addon() {
       -e "s|^#Heartbeat=.*$|Heartbeat=open|" \
       -e "s|^#TitleSpeed=.*$|TitleSpeed=4|" \
       -e "s|^#Hello=\"  Welcome to\"|Hello=\"Welcome to\"|" \
-      -e "s|^#Hello=\"   LCDproc!\"|Hello=\"$DISTRONAME\"|" \
+      -e "s|^#Hello=\"   LCDproc!\"|Hello=\"${DISTRONAME}\"|" \
       -e "s|^#GoodBye=\"Thanks for using\"|GoodBye=\"Thanks for using\"|" \
-      -e "s|^#GoodBye=\"   LCDproc!\"|GoodBye=\"$DISTRONAME\"|" \
+      -e "s|^#GoodBye=\"   LCDproc!\"|GoodBye=\"${DISTRONAME}\"|" \
       -e "s|^#normal_font=.*$|normal_font=/usr/share/fonts/liberation/LiberationMono-Bold.ttf|" \
-      -i $ADDON_BUILD/$PKG_ADDON_ID/config/LCDd.conf
+      -i ${ADDON_BUILD}/${PKG_ADDON_ID}/config/LCDd.conf
 
-  sed -e "s/@DRIVERS@/$drivers/" \
-      -i $ADDON_BUILD/$PKG_ADDON_ID/resources/settings.xml
+  sed -e "s/@DRIVERS@/${drivers}/" \
+      -i ${ADDON_BUILD}/${PKG_ADDON_ID}/resources/settings.xml
 
 }
diff --git a/packages/addons/service/librespot/package.mk b/packages/addons/service/librespot/package.mk
index 49916a0065..42e3d8ca06 100644
--- a/packages/addons/service/librespot/package.mk
+++ b/packages/addons/service/librespot/package.mk
@@ -9,11 +9,11 @@ PKG_REV="125"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/librespot-org/librespot/"
-PKG_URL="https://github.com/librespot-org/librespot/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/librespot-org/librespot/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain alsa-lib avahi libvorbis pulseaudio rust"
 PKG_SECTION="service"
 PKG_SHORTDESC="Librespot: play Spotify through Kodi using a Spotify app as a remote"
-PKG_LONGDESC="Librespot ($PKG_VERSION_DATE) lets you play Spotify through Kodi using a Spotify app as a remote."
+PKG_LONGDESC="Librespot (${PKG_VERSION_DATE}) lets you play Spotify through Kodi using a Spotify app as a remote."
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
@@ -28,15 +28,15 @@ make_target() {
     --release \
     --no-default-features \
     --features "alsa-backend pulseaudio-backend with-dns-sd with-vorbis"
-  $STRIP $PKG_BUILD/.$TARGET_NAME/*/release/librespot
+  ${STRIP} ${PKG_BUILD}/.${TARGET_NAME}/*/release/librespot
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp $PKG_BUILD/.$TARGET_NAME/*/release/librespot \
-       $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp ${PKG_BUILD}/.${TARGET_NAME}/*/release/librespot \
+       ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
     cp $(get_build_dir avahi)/avahi-compat-libdns_sd/.libs/libdns_sd.so.1 \
-       $ADDON_BUILD/$PKG_ADDON_ID/lib
+       ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
 }
diff --git a/packages/addons/service/locale/package.mk b/packages/addons/service/locale/package.mk
index edb718e256..e4afc309f8 100644
--- a/packages/addons/service/locale/package.mk
+++ b/packages/addons/service/locale/package.mk
@@ -7,7 +7,7 @@ PKG_ARCH="any"
 PKG_DEPENDS_TARGET="toolchain glibc"
 PKG_SECTION="service"
 PKG_SHORTDESC="Locale: allows users to set a custom locale to override the POSIX default"
-PKG_LONGDESC="Locale ($PKG_REV) allows users to set a custom locale in the OS to override the POSIX default"
+PKG_LONGDESC="Locale (${PKG_REV}) allows users to set a custom locale in the OS to override the POSIX default"
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
@@ -15,29 +15,29 @@ PKG_ADDON_NAME="Locale"
 PKG_ADDON_TYPE="xbmc.service"
 
 addon() {
-  mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin"
+  mkdir -p "${ADDON_BUILD}/${PKG_ADDON_ID}/bin"
   cp -PR "$(get_install_dir glibc)/.noinstall/localedef" \
-         "$ADDON_BUILD/$PKG_ADDON_ID/bin"
+         "${ADDON_BUILD}/${PKG_ADDON_ID}/bin"
 
-  mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/i18n"
+  mkdir -p "${ADDON_BUILD}/${PKG_ADDON_ID}/i18n"
   cp -PR "$(get_install_dir glibc)/.noinstall/charmaps" \
          "$(get_install_dir glibc)/.noinstall/locales" \
-         "$ADDON_BUILD/$PKG_ADDON_ID/i18n"
+         "${ADDON_BUILD}/${PKG_ADDON_ID}/i18n"
 
-  mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/locpath"
+  mkdir -p "${ADDON_BUILD}/${PKG_ADDON_ID}/locpath"
 
-  cp -PR $PKG_DIR/resources $ADDON_BUILD/$PKG_ADDON_ID
+  cp -PR ${PKG_DIR}/resources ${ADDON_BUILD}/${PKG_ADDON_ID}
 
   locales=""
-  for p in "$ADDON_BUILD/$PKG_ADDON_ID/i18n/locales"/*; do
-    l="$(basename $p)"
-    if [ "$l" = "POSIX" ]; then
+  for p in "${ADDON_BUILD}/${PKG_ADDON_ID}/i18n/locales"/*; do
+    l="$(basename ${p})"
+    if [ "${l}" = "POSIX" ]; then
       continue
     fi
-    locales="$locales|$l"
+    locales+="|${l}"
   done
   locales="${locales:1}"
 
-  sed -e "s/@LOCALES@/$locales/" \
-      -i $ADDON_BUILD/$PKG_ADDON_ID/resources/settings.xml
+  sed -e "s/@LOCALES@/${locales}/" \
+      -i ${ADDON_BUILD}/${PKG_ADDON_ID}/resources/settings.xml
 }
diff --git a/packages/addons/service/minidlna/package.mk b/packages/addons/service/minidlna/package.mk
index 463e4a1f24..ada608f125 100644
--- a/packages/addons/service/minidlna/package.mk
+++ b/packages/addons/service/minidlna/package.mk
@@ -8,11 +8,11 @@ PKG_REV="102"
 PKG_ARCH="any"
 PKG_LICENSE="BSD-3c/GPLv2"
 PKG_SITE="https://sourceforge.net/projects/minidlna/"
-PKG_URL="https://downloads.sourceforge.net/project/minidlna/minidlna/1.3.0/minidlna-$PKG_VERSION.tar.gz"
+PKG_URL="https://downloads.sourceforge.net/project/minidlna/minidlna/1.3.0/minidlna-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ffmpeg flac libexif libiconv libid3tag libjpeg-turbo libogg libvorbis sqlite"
 PKG_SECTION="service"
 PKG_SHORTDESC="MiniDLNA (ReadyMedia): a fully compliant DLNA/UPnP-AV server"
-PKG_LONGDESC="MiniDLNA ($PKG_VERSION_DATE) (ReadyMedia) is a media server, with the aim of being fully compliant with DLNA/UPnP-AV clients."
+PKG_LONGDESC="MiniDLNA (${PKG_VERSION_DATE}) (ReadyMedia) is a media server, with the aim of being fully compliant with DLNA/UPnP-AV clients."
 PKG_TOOLCHAIN="autotools"
 
 PKG_IS_ADDON="yes"
@@ -23,19 +23,19 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-static \
                            --disable-nls \
                            --without-libiconv-prefix \
                            --without-libintl-prefix \
-                           --with-os-name="$DISTRONAME" \
+                           --with-os-name="${DISTRONAME}" \
                            --with-db-path="/storage/.kodi/userdata/addon_data/service.minidlna/db" \
                            --with-os-url="https://libreelec.tv""
 
 pre_configure_target() {
-  export LDFLAGS="$LDFLAGS -L$(get_install_dir ffmpeg)/usr/lib"
-  export LIBS="$LIBS -lid3tag -lFLAC -logg -lz -lpthread -ldl -lm"
+  export LDFLAGS="${LDFLAGS} -L$(get_install_dir ffmpeg)/usr/lib"
+  export LIBS="${LIBS} -lid3tag -lFLAC -logg -lz -lpthread -ldl -lm"
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_INSTALL/usr/sbin/minidlnad $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp -P ${PKG_INSTALL}/usr/sbin/minidlnad ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -p $(get_install_dir libexif)/usr/lib/libexif.so.12 $ADDON_BUILD/$PKG_ADDON_ID/lib
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+  cp -p $(get_install_dir libexif)/usr/lib/libexif.so.12 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
 }
diff --git a/packages/addons/service/minisatip/package.mk b/packages/addons/service/minisatip/package.mk
index cd45e4b036..f6cabdb082 100644
--- a/packages/addons/service/minisatip/package.mk
+++ b/packages/addons/service/minisatip/package.mk
@@ -8,11 +8,11 @@ PKG_REV="103"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/catalinii/minisatip"
-PKG_URL="https://github.com/catalinii/minisatip/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/catalinii/minisatip/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain dvb-apps libdvbcsa libxml2 openssl"
 PKG_SECTION="service"
 PKG_SHORTDESC="minisatip: a Sat>IP streaming server for Linux"
-PKG_LONGDESC="minisatip($PKG_VERSION_NUMBER): is a Sat>IP streaming server for Linux supporting DVB-C, DVB-S/S2, DVB-T/T2, ATSC and ISDB-T"
+PKG_LONGDESC="minisatip(${PKG_VERSION_NUMBER}): is a Sat>IP streaming server for Linux supporting DVB-C, DVB-S/S2, DVB-T/T2, ATSC and ISDB-T"
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_IS_ADDON="yes"
@@ -27,8 +27,8 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --with-xml2=$(get_install_dir libxml2)/usr/include/libxml2"
 
 pre_configure_target() {
-  cd $PKG_BUILD
-    rm -rf .$TARGET_NAME
+  cd ${PKG_BUILD}
+    rm -rf .${TARGET_NAME}
 
   # enables Common Interface (DVBEN50221)
   CFLAGS+=" -I$(get_install_dir dvb-apps)/usr/include"
@@ -40,8 +40,8 @@ makeinstall_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $PKG_BUILD/minisatip $ADDON_BUILD/$PKG_ADDON_ID/bin
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/webif
-    cp -PR $PKG_BUILD/html/* $ADDON_BUILD/$PKG_ADDON_ID/webif
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P ${PKG_BUILD}/minisatip ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/webif
+    cp -PR ${PKG_BUILD}/html/* ${ADDON_BUILD}/${PKG_ADDON_ID}/webif
 }
diff --git a/packages/addons/service/mpd/package.mk b/packages/addons/service/mpd/package.mk
index bf95cc050c..b5fb026f41 100644
--- a/packages/addons/service/mpd/package.mk
+++ b/packages/addons/service/mpd/package.mk
@@ -14,7 +14,7 @@ PKG_DEPENDS_TARGET="toolchain alsa-lib avahi boost curl faad2 ffmpeg flac glib l
                     libmad libmpdclient libsamplerate libvorbis libnfs libogg mpd-mpc opus pulseaudio samba yajl libgcrypt"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="Music Player Daemon (MPD): a free and open Music Player Server"
-PKG_LONGDESC="Music Player Daemon ($PKG_VERSION) is a flexible and powerful server-side application for playing music"
+PKG_LONGDESC="Music Player Daemon (${PKG_VERSION}) is a flexible and powerful server-side application for playing music"
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_IS_ADDON="yes"
@@ -98,12 +98,12 @@ PKG_MESON_OPTS_TARGET=" \
   -Dzzip=disabled"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_INSTALL/usr/bin/mpd $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp -P ${PKG_INSTALL}/usr/bin/mpd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
   # copy mpd cli binary
-  cp -P $(get_install_dir mpd-mpc)/usr/bin/mpc $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $(get_install_dir mpd-mpc)/usr/bin/mpc ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -p $(get_install_dir libmpdclient)/usr/lib/libmpdclient.so $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -p $(get_install_dir libmpdclient)/usr/lib/libmpdclient.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+  cp -p $(get_install_dir libmpdclient)/usr/lib/libmpdclient.so ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+  cp -p $(get_install_dir libmpdclient)/usr/lib/libmpdclient.so.2 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
 }
diff --git a/packages/addons/service/net-snmp/package.mk b/packages/addons/service/net-snmp/package.mk
index 65b8093be8..595a95484f 100644
--- a/packages/addons/service/net-snmp/package.mk
+++ b/packages/addons/service/net-snmp/package.mk
@@ -8,7 +8,7 @@ PKG_REV="107"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.net-snmp.org"
-PKG_URL="https://sourceforge.net/projects/net-snmp/files/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://sourceforge.net/projects/net-snmp/files/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libnl openssl"
 PKG_SECTION="service"
 PKG_SHORTDESC="Simple Network Management Protocol utilities."
@@ -41,7 +41,7 @@ configure_package() {
         --sbindir=/storage/.kodi/addons/${PKG_ADDON_ID}/bin \
         --libdir=/storage/.kodi/addons/${PKG_ADDON_ID}/lib \
         --disable-embedded-perl \
-        --with-sysroot=$SYSROOT_PREFIX"
+        --with-sysroot=${SYSROOT_PREFIX}"
 }
 
 make_target() {
@@ -49,10 +49,10 @@ make_target() {
 }
 
 makeinstall_target() {
-  make install INSTALL_PREFIX=$INSTALL
+  make install INSTALL_PREFIX=${INSTALL}
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -r $PKG_INSTALL/storage/.kodi/addons/${PKG_ADDON_ID}/bin $PKG_INSTALL/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID}/share $ADDON_BUILD/$PKG_ADDON_ID/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+  cp -r ${PKG_INSTALL}/storage/.kodi/addons/${PKG_ADDON_ID}/bin ${PKG_INSTALL}/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID}/share ${ADDON_BUILD}/${PKG_ADDON_ID}/
 }
diff --git a/packages/addons/service/oscam/package.mk b/packages/addons/service/oscam/package.mk
index c56894ff16..50d66e6aa0 100644
--- a/packages/addons/service/oscam/package.mk
+++ b/packages/addons/service/oscam/package.mk
@@ -9,11 +9,11 @@ PKG_REV="110"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.streamboard.tv/oscam/wiki"
-PKG_URL="http://repo.or.cz/oscam.git/snapshot/$PKG_VERSION.tar.gz"
+PKG_URL="http://repo.or.cz/oscam.git/snapshot/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain openssl pcsc-lite"
 PKG_SECTION="service.softcam"
 PKG_SHORTDESC="OSCam: an Open Source Conditional Access Modul"
-PKG_LONGDESC="OSCam($PKG_VERSION_NUMBER) is a software to be used to decrypt digital television channels, as an alternative for a conditional access module."
+PKG_LONGDESC="OSCam(${PKG_VERSION_NUMBER}) is a software to be used to decrypt digital television channels, as an alternative for a conditional access module."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="OSCam"
@@ -21,8 +21,8 @@ PKG_ADDON_TYPE="xbmc.service"
 
 PKG_CMAKE_OPTS_TARGET="\
   `#Building` \
-  -DLIBUSBDIR=$SYSROOT_PREFIX/usr \
-  -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \
+  -DLIBUSBDIR=${SYSROOT_PREFIX}/usr \
+  -DOPTIONAL_INCLUDE_DIR=${SYSROOT_PREFIX}/usr/include \
   \
   `#Readers` \
   -DCARDREADER_DB2COM=OFF \
@@ -68,7 +68,7 @@ PKG_CMAKE_OPTS_TARGET="\
   -DWITH_STAPI=0"
 
 pre_configure_target() {
-  export OSCAM_ADDON_VERSION="$PKG_VERSION_NUMBER"
+  export OSCAM_ADDON_VERSION="${PKG_VERSION_NUMBER}"
 }
 
 makeinstall_target() {
@@ -76,7 +76,7 @@ makeinstall_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $PKG_BUILD/.$TARGET_NAME/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $PKG_BUILD/.$TARGET_NAME/utils/list_smargo $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P ${PKG_BUILD}/.${TARGET_NAME}/oscam ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P ${PKG_BUILD}/.${TARGET_NAME}/utils/list_smargo ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
diff --git a/packages/addons/service/pcscd/package.mk b/packages/addons/service/pcscd/package.mk
index fa677a60f3..975889681b 100644
--- a/packages/addons/service/pcscd/package.mk
+++ b/packages/addons/service/pcscd/package.mk
@@ -21,11 +21,11 @@ PKG_ADDON_NAME="PC/SC Smart Card Daemon"
 PKG_ADDON_TYPE="xbmc.service"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
-    cp -Pa $(get_install_dir pcsc-lite)/usr/sbin/pcscd $ADDON_BUILD/$PKG_ADDON_ID/bin/pcscd.bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
+    cp -Pa $(get_install_dir pcsc-lite)/usr/sbin/pcscd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/pcscd.bin
 
-  cp -a $(get_install_dir ccid)/storage/.kodi/addons/$PKG_ADDON_ID/drivers $ADDON_BUILD/$PKG_ADDON_ID
+  cp -a $(get_install_dir ccid)/storage/.kodi/addons/${PKG_ADDON_ID}/drivers ${ADDON_BUILD}/${PKG_ADDON_ID}
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
-    cp -Pa $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config
+    cp -Pa ${PKG_DIR}/config/* ${ADDON_BUILD}/${PKG_ADDON_ID}/config/
 }
diff --git a/packages/addons/service/proftpd/package.mk b/packages/addons/service/proftpd/package.mk
index 0b56c8d487..2d880f7d15 100644
--- a/packages/addons/service/proftpd/package.mk
+++ b/packages/addons/service/proftpd/package.mk
@@ -9,11 +9,11 @@ PKG_REV="103"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.proftpd.org/"
-PKG_URL="https://github.com/proftpd/proftpd/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/proftpd/proftpd/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libcap openssl ncurses pcre whois"
 PKG_SECTION="service"
 PKG_SHORTDESC="ProFTPD: a FTP server for linux"
-PKG_LONGDESC="ProFTPD ($PKG_VERSION): is a secure and configurable FTP server with SSL/TLS support"
+PKG_LONGDESC="ProFTPD (${PKG_VERSION}): is a secure and configurable FTP server with SSL/TLS support"
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_IS_ADDON="yes"
@@ -26,7 +26,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --enable-openssl \
                            --with-modules=mod_tls \
                            --enable-nls \
-                           --localedir=$ADDON_DIR/locale \
+                           --localedir=${ADDON_DIR}/locale \
                            --enable-sendfile \
                            --enable-facl \
                            --enable-autoshadow \
@@ -39,21 +39,21 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            install_group=$(id -g)"
 
 pre_configure_target() {
-  export CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+  export CFLAGS="${CFLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
   cd ..
-  rm -rf .$TARGET_NAME
+  rm -rf .${TARGET_NAME}
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp $PKG_INSTALL/usr/sbin/proftpd $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp $PKG_INSTALL/usr/bin/ftpwho $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp $PKG_INSTALL/usr/bin/ftptop $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp ${PKG_INSTALL}/usr/sbin/proftpd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp ${PKG_INSTALL}/usr/bin/ftpwho ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp ${PKG_INSTALL}/usr/bin/ftptop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
-    cp $(get_install_dir whois)/usr/bin/mkpasswd $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp $(get_install_dir whois)/usr/bin/mkpasswd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/locale
-    for i in $PKG_INSTALL/storage/.kodi/addons/$PKG_ADDON_ID/locale/*; do
-      cp $i/LC_MESSAGES/proftpd.mo $ADDON_BUILD/$PKG_ADDON_ID/locale/$(basename $i).mo
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/locale
+    for i in ${PKG_INSTALL}/storage/.kodi/addons/${PKG_ADDON_ID}/locale/*; do
+      cp ${i}/LC_MESSAGES/proftpd.mo ${ADDON_BUILD}/${PKG_ADDON_ID}/locale/$(basename ${i}).mo
     done
 }
diff --git a/packages/addons/service/rsyslog/package.mk b/packages/addons/service/rsyslog/package.mk
index ac8503b735..e2208b6d37 100644
--- a/packages/addons/service/rsyslog/package.mk
+++ b/packages/addons/service/rsyslog/package.mk
@@ -8,11 +8,11 @@ PKG_REV="105"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/rsyslog"
-PKG_URL="http://www.rsyslog.com/files/download/rsyslog/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://www.rsyslog.com/files/download/rsyslog/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain curl libestr libfastjson libgcrypt liblogging liblognorm librelp util-linux zlib"
 PKG_SECTION="service"
 PKG_SHORTDESC="Rsyslog: a rocket-fast system for log processing."
-PKG_LONGDESC="Rsyslog ($PKG_VERSION) offers high-performance, great security features and a modular design."
+PKG_LONGDESC="Rsyslog (${PKG_VERSION}) offers high-performance, great security features and a modular design."
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_IS_ADDON="yes"
@@ -27,20 +27,20 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-default-tests \
                            ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes"
 
-export LIBGCRYPT_CONFIG="$SYSROOT_PREFIX/usr/bin/libgcrypt-config"
+export LIBGCRYPT_CONFIG="${SYSROOT_PREFIX}/usr/bin/libgcrypt-config"
 
 pre_configure_target() {
-  CFLAGS="$CFLAGS -fcommon"
+  CFLAGS+=" -fcommon"
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_INSTALL/usr/sbin/rsyslogd \
-     $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp ${PKG_INSTALL}/usr/sbin/rsyslogd \
+     ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/rsyslog
-  for l in $(find $PKG_INSTALL/usr/lib -name *.so)
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/rsyslog
+  for l in $(find ${PKG_INSTALL}/usr/lib -name *.so)
   do
-    cp $l $ADDON_BUILD/$PKG_ADDON_ID/lib/rsyslog/
+    cp ${l} ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/rsyslog/
   done
 }
diff --git a/packages/addons/service/snapclient/package.mk b/packages/addons/service/snapclient/package.mk
index dd7ed292c0..410def061c 100644
--- a/packages/addons/service/snapclient/package.mk
+++ b/packages/addons/service/snapclient/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="GPLv3"
 PKG_DEPENDS_TARGET="toolchain alsa-plugins snapcast"
 PKG_SECTION="service"
 PKG_SHORTDESC="Snapclient: Synchronous multi-room audio client"
-PKG_LONGDESC="Snapclient ($PKG_VERSION) is a Snapcast client. Snapcast is a multi-room client-server audio system, where all clients are time synchronized with the server to play perfectly synced audioplays."
+PKG_LONGDESC="Snapclient (${PKG_VERSION}) is a Snapcast client. Snapcast is a multi-room client-server audio system, where all clients are time synchronized with the server to play perfectly synced audioplays."
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
@@ -18,11 +18,11 @@ PKG_ADDON_TYPE="xbmc.service.library"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 addon() {
-  mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin"
+  mkdir -p "${ADDON_BUILD}/${PKG_ADDON_ID}/bin"
   cp "$(get_install_dir snapcast)/usr/bin/snapclient" \
-     "$ADDON_BUILD/$PKG_ADDON_ID/bin"
+     "${ADDON_BUILD}/${PKG_ADDON_ID}/bin"
 
-  mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/lib"
+  mkdir -p "${ADDON_BUILD}/${PKG_ADDON_ID}/lib"
   cp "$(get_install_dir alsa-plugins)/usr/lib/alsa"/*.so \
-     "$ADDON_BUILD/$PKG_ADDON_ID/lib"
+     "${ADDON_BUILD}/${PKG_ADDON_ID}/lib"
 }
diff --git a/packages/addons/service/snapserver/package.mk b/packages/addons/service/snapserver/package.mk
index 45f9509ec1..f0aae4f499 100644
--- a/packages/addons/service/snapserver/package.mk
+++ b/packages/addons/service/snapserver/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="GPLv3"
 PKG_DEPENDS_TARGET="toolchain shairport-sync snapcast"
 PKG_SECTION="service"
 PKG_SHORTDESC="Snapserver: Synchronous multi-room audio server"
-PKG_LONGDESC="Snapclient ($PKG_VERSION) is a Snapcast server. Snapcast is a multi-room client-server audio system, where all clients are time synchronized with the server to play perfectly synced audioplays."
+PKG_LONGDESC="Snapclient (${PKG_VERSION}) is a Snapcast server. Snapcast is a multi-room client-server audio system, where all clients are time synchronized with the server to play perfectly synced audioplays."
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
@@ -19,8 +19,8 @@ PKG_ADDON_REQUIRES="service.librespot:0.0.0"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 addon() {
-  mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin"
+  mkdir -p "${ADDON_BUILD}/${PKG_ADDON_ID}/bin"
   cp "$(get_install_dir shairport-sync)/usr/bin/shairport-sync" \
      "$(get_install_dir snapcast)/usr/bin/snapserver" \
-     "$ADDON_BUILD/$PKG_ADDON_ID/bin"
+     "${ADDON_BUILD}/${PKG_ADDON_ID}/bin"
 }
diff --git a/packages/addons/service/tigervnc/package.mk b/packages/addons/service/tigervnc/package.mk
index d3fc2d1b1d..b23db21ab1 100644
--- a/packages/addons/service/tigervnc/package.mk
+++ b/packages/addons/service/tigervnc/package.mk
@@ -8,11 +8,11 @@ PKG_REV="105"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://www.tigervnc.org"
-PKG_URL="https://github.com/TigerVNC/tigervnc/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/TigerVNC/tigervnc/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain cmake:host libX11 libXdamage libXext libXtst zlib libjpeg-turbo"
 PKG_SECTION="service"
-PKG_SHORTDESC="$PKG_ADDON_NAME server"
-PKG_LONGDESC="$PKG_ADDON_NAME ($PKG_VERSION) is a high-performance, platform-neutral implementation of Virtual Network Computing, a client/server application that allows users to launch and interact with graphical applications on remote machines"
+PKG_SHORTDESC="${PKG_ADDON_NAME} server"
+PKG_LONGDESC="${PKG_ADDON_NAME} (${PKG_VERSION}) is a high-performance, platform-neutral implementation of Virtual Network Computing, a client/server application that allows users to launch and interact with graphical applications on remote machines"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="TigerVNC"
@@ -25,9 +25,9 @@ makeinstall_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/.$TARGET_NAME/unix/vncconfig/vncconfig     \
-     $PKG_BUILD/.$TARGET_NAME/unix/vncpasswd/vncpasswd     \
-     $PKG_BUILD/.$TARGET_NAME/unix/x0vncserver/x0vncserver \
-     $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp ${PKG_BUILD}/.${TARGET_NAME}/unix/vncconfig/vncconfig     \
+     ${PKG_BUILD}/.${TARGET_NAME}/unix/vncpasswd/vncpasswd     \
+     ${PKG_BUILD}/.${TARGET_NAME}/unix/x0vncserver/x0vncserver \
+     ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 }
diff --git a/packages/addons/service/tinc/package.mk b/packages/addons/service/tinc/package.mk
index d3fafb024e..0cf3af36ed 100644
--- a/packages/addons/service/tinc/package.mk
+++ b/packages/addons/service/tinc/package.mk
@@ -8,11 +8,11 @@ PKG_REV="105"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://www.tinc-vpn.org/"
-PKG_URL="https://github.com/gsliepen/tinc/archive/release-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/gsliepen/tinc/archive/release-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain lzo miniupnpc ncurses openssl readline zlib"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="tinc: a Virtual Private Network daemon"
-PKG_LONGDESC="tinc ($PKG_VERSION) is a Virtual Private Network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet. Because the VPN appears to the IP level network code as a normal network device, there is no need to adapt any existing software. This allows VPN sites to share information with each other over the Internet without exposing any information to others."
+PKG_LONGDESC="tinc (${PKG_VERSION}) is a Virtual Private Network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet. Because the VPN appears to the IP level network code as a normal network device, there is no need to adapt any existing software. This allows VPN sites to share information with each other over the Internet without exposing any information to others."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="+pic"
 
@@ -31,7 +31,7 @@ make_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_INSTALL/usr/sbin/* \
-     $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp ${PKG_INSTALL}/usr/sbin/* \
+     ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
diff --git a/packages/addons/service/touchscreen/package.mk b/packages/addons/service/touchscreen/package.mk
index 8f9f8bcca8..eacd6d361d 100644
--- a/packages/addons/service/touchscreen/package.mk
+++ b/packages/addons/service/touchscreen/package.mk
@@ -22,14 +22,14 @@ PKG_ADDON_NAME="Touchscreen"
 PKG_ADDON_TYPE="xbmc.service"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
-  cp $PKG_DIR/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
+  cp ${PKG_DIR}/addon.xml ${ADDON_BUILD}/${PKG_ADDON_ID}
 
   # set only version (revision will be added by buildsystem)
-  sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
-      -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
+  sed -e "s|@ADDON_VERSION@|${ADDON_VERSION}|g" \
+      -i ${ADDON_BUILD}/${PKG_ADDON_ID}/addon.xml
 
-  cp $(get_install_dir tslib)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $(get_install_dir evtest)/usr/bin/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $(get_install_dir tslib)/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp $(get_install_dir evtest)/usr/bin/evtest ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
diff --git a/packages/addons/service/ttyd/package.mk b/packages/addons/service/ttyd/package.mk
index aee563f218..f3514fc50a 100644
--- a/packages/addons/service/ttyd/package.mk
+++ b/packages/addons/service/ttyd/package.mk
@@ -8,22 +8,22 @@ PKG_REV="102"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/tsl0922/ttyd"
-PKG_URL="https://github.com/tsl0922/ttyd/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/tsl0922/ttyd/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libwebsockets"
 PKG_SECTION="service"
 PKG_SHORTDESC="ttyd: a tool for accessing the terminal over a browser"
-PKG_LONGDESC="ttyd ($PKG_VERSION): is a simple command-line tool for sharing terminal over the web"
+PKG_LONGDESC="ttyd (${PKG_VERSION}): is a simple command-line tool for sharing terminal over the web"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Web SSH Terminal"
 PKG_ADDON_TYPE="xbmc.service"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_INSTALL/usr/bin/ttyd $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp -P ${PKG_INSTALL}/usr/bin/ttyd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -p $(get_install_dir json-c)/usr/lib/libjson-c.so.5 $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets.so.17 $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -p $(get_install_dir libuv)/usr/lib/libuv.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+  cp -p $(get_install_dir json-c)/usr/lib/libjson-c.so.5 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+  cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets.so.17 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+  cp -p $(get_install_dir libuv)/usr/lib/libuv.so.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
 }
diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk
index 3bf0a68bec..2075f85c30 100644
--- a/packages/addons/service/tvheadend42/package.mk
+++ b/packages/addons/service/tvheadend42/package.mk
@@ -9,13 +9,13 @@ PKG_REV="125"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"
-PKG_URL="https://github.com/tvheadend/tvheadend/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/tvheadend/tvheadend/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain avahi comskip curl dvb-apps ffmpegx libdvbcsa libhdhomerun \
                     libiconv openssl pngquant:host Python3:host tvh-dtv-scan-tables"
 PKG_DEPENDS_CONFIG="ffmpegx"
 PKG_SECTION="service"
 PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux"
-PKG_LONGDESC="Tvheadend ($PKG_VERSION_NUMBER): is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV, SAT>IP, ATSC and ISDB-T"
+PKG_LONGDESC="Tvheadend (${PKG_VERSION_NUMBER}): is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV, SAT>IP, ATSC and ISDB-T"
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_IS_ADDON="yes"
@@ -42,23 +42,23 @@ PKG_TVH_TRANSCODING="\
   --enable-libx265"
 
 # specific transcoding options
-if [[ "$TARGET_ARCH" != "x86_64" ]]; then
-  PKG_TVH_TRANSCODING="$PKG_TVH_TRANSCODING \
+if [[ "${TARGET_ARCH}" != "x86_64" ]]; then
+  PKG_TVH_TRANSCODING="${PKG_TVH_TRANSCODING} \
     --disable-libvpx \
     --disable-libx265"
 fi
 
 post_unpack() {
-  sed -e 's/VER="0.0.0~unknown"/VER="'$PKG_VERSION_NUMBER' ~ LibreELEC Tvh-addon v'$ADDON_VERSION'.'$PKG_REV'"/g' -i $PKG_BUILD/support/version
-  sed -e 's|'/usr/bin/pngquant'|'$TOOLCHAIN/bin/pngquant'|g' -i $PKG_BUILD/support/mkbundle
+  sed -e 's/VER="0.0.0~unknown"/VER="'${PKG_VERSION_NUMBER}' ~ LibreELEC Tvh-addon v'${ADDON_VERSION}'.'${PKG_REV}'"/g' -i ${PKG_BUILD}/support/version
+  sed -e 's|'/usr/bin/pngquant'|'${TOOLCHAIN}/bin/pngquant'|g' -i ${PKG_BUILD}/support/mkbundle
 }
 
 pre_configure_target() {
   PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
-                             --arch=$TARGET_ARCH \
-                             --cpu=$TARGET_CPU \
-                             --cc=$CC \
-                             $PKG_TVH_TRANSCODING \
+                             --arch=${TARGET_ARCH} \
+                             --cpu=${TARGET_CPU} \
+                             --cc=${CC} \
+                             ${PKG_TVH_TRANSCODING} \
                              --enable-avahi \
                              --enable-bundle \
                              --disable-dbus_1 \
@@ -77,47 +77,47 @@ pre_configure_target() {
                              --enable-trace \
                              --nowerror \
                              --disable-bintray_cache \
-                             --python=$TOOLCHAIN/bin/python"
+                             --python=${TOOLCHAIN}/bin/python"
 
 # fails to build in subdirs
-  cd $PKG_BUILD
-  rm -rf .$TARGET_NAME
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}
 
 # pass ffmpegx to build
   CFLAGS+=" -I$(get_install_dir ffmpegx)/usr/local/include"
   LDFLAGS+=" -L$(get_install_dir ffmpegx)/usr/local/lib"
 
 # pass libhdhomerun to build
-  CFLAGS+=" -I$SYSROOT_PREFIX/usr/include/hdhomerun"
+  CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/hdhomerun"
 
-  export CROSS_COMPILE="$TARGET_PREFIX"
-  export CFLAGS+=" -I$SYSROOT_PREFIX/usr/include/iconv -L$SYSROOT_PREFIX/usr/lib/iconv"
+  export CROSS_COMPILE="${TARGET_PREFIX}"
+  export CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/iconv -L${SYSROOT_PREFIX}/usr/lib/iconv"
 }
 
 post_make_target() {
-  $CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
+  ${CC} -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
 }
 
 post_makeinstall_target() {
-  mkdir -p $INSTALL/usr/lib
-  cp -p capmt_ca.so $INSTALL/usr/lib
+  mkdir -p ${INSTALL}/usr/lib
+  cp -p capmt_ca.so ${INSTALL}/usr/lib
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
-  cp $PKG_DIR/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
+  cp ${PKG_DIR}/addon.xml ${ADDON_BUILD}/${PKG_ADDON_ID}
 
   # set only version (revision will be added by buildsystem)
-  sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
-      -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
+  sed -e "s|@ADDON_VERSION@|${ADDON_VERSION}|g" \
+      -i ${ADDON_BUILD}/${PKG_ADDON_ID}/addon.xml
 
-  cp -P $PKG_INSTALL/usr/bin/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_INSTALL/usr/lib/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $(get_install_dir comskip)/usr/bin/comskip $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P ${PKG_INSTALL}/usr/bin/tvheadend ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp -P ${PKG_INSTALL}/usr/lib/capmt_ca.so ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp -P $(get_install_dir comskip)/usr/bin/comskip ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
   # dvb-scan files
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/dvb-scan
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/dvb-scan
   cp -r $(get_install_dir tvh-dtv-scan-tables)/usr/share/dvbv5/* \
-        $ADDON_BUILD/$PKG_ADDON_ID/dvb-scan
+        ${ADDON_BUILD}/${PKG_ADDON_ID}/dvb-scan
 }
diff --git a/packages/addons/service/usbmuxd/package.mk b/packages/addons/service/usbmuxd/package.mk
index b29fcfe54b..f81459dcdb 100644
--- a/packages/addons/service/usbmuxd/package.mk
+++ b/packages/addons/service/usbmuxd/package.mk
@@ -28,6 +28,6 @@ makeinstall_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $PKG_BUILD/.$TARGET_NAME/src/usbmuxd $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/usbmuxd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 }
diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk
index 0e47e94df1..38582ea253 100644
--- a/packages/addons/service/vdr-addon/package.mk
+++ b/packages/addons/service/vdr-addon/package.mk
@@ -25,41 +25,41 @@ PKG_ADDON_REQUIRES="pvr.vdr.vnsi:0.0.0 script.config.vdr:0.0.0"
 
 addon() {
   # create dirs
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/{bin,lib,plugin}
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/{eepg,epgfixer,epgsearch,streamdev-server,vnsiserver}
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/{live,restfulapi}
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib,plugin}
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config/epgsources
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config/plugins/{eepg,epgfixer,epgsearch,streamdev-server,vnsiserver}
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/res/plugins/{live,restfulapi}
 
   # configs
-  cp -P $(get_build_dir vdr)/{diseqc.conf,keymacros.conf,scr.conf,sources.conf,svdrphosts.conf} $ADDON_BUILD/$PKG_ADDON_ID/config
-  cp -P $(get_build_dir vdr-plugin-epgfixer)/epgfixer/*.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer
-  cp -P $(get_build_dir vdr-plugin-streamdev)/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
-  cp -P $(get_build_dir vdr-plugin-vnsiserver)/vnsiserver/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
+  cp -P $(get_build_dir vdr)/{diseqc.conf,keymacros.conf,scr.conf,sources.conf,svdrphosts.conf} ${ADDON_BUILD}/${PKG_ADDON_ID}/config
+  cp -P $(get_build_dir vdr-plugin-epgfixer)/epgfixer/*.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config/plugins/epgfixer
+  cp -P $(get_build_dir vdr-plugin-streamdev)/streamdev-server/streamdevhosts.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config/plugins/streamdev-server
+  cp -P $(get_build_dir vdr-plugin-vnsiserver)/vnsiserver/allowed_hosts.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config/plugins/vnsiserver
 
-  touch $ADDON_BUILD/$PKG_ADDON_ID/config/channels.conf
-  echo '0.0.0.0/0' >> $ADDON_BUILD/$PKG_ADDON_ID/config/svdrphosts.conf
+  touch ${ADDON_BUILD}/${PKG_ADDON_ID}/config/channels.conf
+  echo '0.0.0.0/0' >> ${ADDON_BUILD}/${PKG_ADDON_ID}/config/svdrphosts.conf
 
   # copy static files
   cp -PR $(get_build_dir vdr-plugin-restfulapi)/web/* \
          $(get_build_dir vdr-plugin-restfulapi)/API.html \
-         $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
+         ${ADDON_BUILD}/${PKG_ADDON_ID}/res/plugins/restfulapi
 
-  cp -PR $(get_build_dir vdr-plugin-live)/live/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
+  cp -PR $(get_build_dir vdr-plugin-live)/live/* ${ADDON_BUILD}/${PKG_ADDON_ID}/res/plugins/live
 
-  cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv
+  cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv.dist ${ADDON_BUILD}/${PKG_ADDON_ID}/config/epgsources/epgdata2xmltv
 
   # copy binaries
   for pkg in ddci2 dummydevice dvbapi eepg epgfixer epgsearch iptv live restfulapi robotv satip vnsiserver wirbelscan wirbelscancontrol xmltv2vdr; do
-    cp -PR $(get_build_dir vdr-plugin-$pkg)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+    cp -PR $(get_build_dir vdr-plugin-${pkg})/libvdr*.so.* ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin
   done
 
   cp -P $(get_build_dir vdr-plugin-streamdev)/client/libvdr*.so.* \
         $(get_build_dir vdr-plugin-streamdev)/server/libvdr*.so.* \
-        $ADDON_BUILD/$PKG_ADDON_ID/plugin
+        ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin
 
-  cp -PL $(get_install_dir tntnet)/usr/lib/libtntnet.so.12 $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -PL $(get_install_dir tntnet)/usr/lib/libtntnet.so.12 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
 
-  cp -P $(get_build_dir vdr)/vdr $ADDON_BUILD/$PKG_ADDON_ID/bin/vdr.bin
+  cp -P $(get_build_dir vdr)/vdr ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/vdr.bin
 
-  cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
diff --git a/packages/addons/skin/estouchy/package.mk b/packages/addons/skin/estouchy/package.mk
index c8e38a70fd..b506e2c686 100644
--- a/packages/addons/skin/estouchy/package.mk
+++ b/packages/addons/skin/estouchy/package.mk
@@ -19,6 +19,6 @@ PKG_ADDON_NAME="Estouchy"
 PKG_ADDON_TYPE="xbmc.gui.skin"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-    cp -a $(get_install_dir kodi)/.noinstall/skin.estouchy/* $ADDON_BUILD/$PKG_ADDON_ID
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}
+    cp -a $(get_install_dir kodi)/.noinstall/skin.estouchy/* ${ADDON_BUILD}/${PKG_ADDON_ID}
 }
diff --git a/packages/addons/tools/btrfs-progs/package.mk b/packages/addons/tools/btrfs-progs/package.mk
index 27d1af5cce..76eb13eba4 100644
--- a/packages/addons/tools/btrfs-progs/package.mk
+++ b/packages/addons/tools/btrfs-progs/package.mk
@@ -8,7 +8,7 @@ PKG_REV="102"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://btrfs.wiki.kernel.org/index.php/Main_Page"
-PKG_URL="https://github.com/kdave/btrfs-progs/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/kdave/btrfs-progs/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain util-linux zlib lzo zstd"
 PKG_SECTION="tools"
 PKG_SHORTDESC="tools for the btrfs filesystem"
@@ -30,6 +30,6 @@ pre_configure_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
-    cp -P $PKG_INSTALL/usr/bin/{btrfs,btrfsck,btrfstune,btrfs-zero-log,fsck.btrfs,mkfs.btrfs} $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
+    cp -P ${PKG_INSTALL}/usr/bin/{btrfs,btrfsck,btrfstune,btrfs-zero-log,fsck.btrfs,mkfs.btrfs} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk
index 215d729850..0178df7867 100644
--- a/packages/addons/tools/dotnet-runtime/package.mk
+++ b/packages/addons/tools/dotnet-runtime/package.mk
@@ -10,7 +10,7 @@ PKG_SITE="https://dotnet.github.io/"
 PKG_DEPENDS_TARGET="toolchain icu"
 PKG_SECTION="tools"
 PKG_SHORTDESC=".NET Core Runtime"
-PKG_LONGDESC=".NET Core Runtime ($PKG_VERSION) runs applications built with .NET Core, a cross-platform .NET implementation."
+PKG_LONGDESC=".NET Core Runtime (${PKG_VERSION}) runs applications built with .NET Core, a cross-platform .NET implementation."
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
@@ -36,11 +36,11 @@ esac
 PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -r $PKG_BUILD/* \
-          $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -r ${PKG_BUILD}/* \
+          ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
     cp -L $(get_install_dir icu)/usr/lib/lib*.so.?? \
-          $ADDON_BUILD/$PKG_ADDON_ID/lib/
+          ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
 }
diff --git a/packages/addons/tools/dvb-tools/package.mk b/packages/addons/tools/dvb-tools/package.mk
index 1b944108b7..81fa9bf30c 100644
--- a/packages/addons/tools/dvb-tools/package.mk
+++ b/packages/addons/tools/dvb-tools/package.mk
@@ -29,42 +29,42 @@ PKG_DEPENDS_TARGET="toolchain \
                     w_scan"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 
     # blindscan-s2
-    cp -P $(get_install_dir blindscan-s2)/usr/bin/blindscan-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir blindscan-s2)/usr/bin/blindscan-s2 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # dvb-apps
-    cp -P $(get_install_dir dvb-apps)/usr/bin/dvbdate $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir dvb-apps)/usr/bin/dvbnet $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir dvb-apps)/usr/bin/dvbscan $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir dvb-apps)/usr/bin/dvbtraffic $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir dvb-apps)/usr/bin/femon $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir dvb-apps)/usr/bin/scan $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir dvb-apps)/usr/bin/azap $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir dvb-apps)/usr/bin/czap $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir dvb-apps)/usr/bin/szap $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir dvb-apps)/usr/bin/tzap $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir dvb-apps)/usr/bin/zap $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir dvb-apps)/usr/bin/dvbdate ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir dvb-apps)/usr/bin/dvbnet ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir dvb-apps)/usr/bin/dvbscan ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir dvb-apps)/usr/bin/dvbtraffic ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir dvb-apps)/usr/bin/femon ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir dvb-apps)/usr/bin/scan ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir dvb-apps)/usr/bin/azap ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir dvb-apps)/usr/bin/czap ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir dvb-apps)/usr/bin/szap ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir dvb-apps)/usr/bin/tzap ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir dvb-apps)/usr/bin/zap ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # dvblast
-    cp -P $(get_install_dir dvblast)/usr/bin/dvblast $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir dvblast)/usr/bin/dvblast ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # dvbsnoop
-    cp -P $(get_install_dir dvbsnoop)/usr/bin/dvbsnoop $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir dvbsnoop)/usr/bin/dvbsnoop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # mumudvb
-    cp -P $(get_install_dir mumudvb)/usr/bin/mumudvb $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir mumudvb)/usr/bin/mumudvb ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # szap-s2
-    cp -P $(get_install_dir szap-s2)/usr/bin/szap-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir szap-s2)/usr/bin/szap-s2 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # tune-s2
-    cp -P $(get_install_dir tune-s2)/usr/bin/tune-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir tune-s2)/usr/bin/tune-s2 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # t2scan
-    cp -P $(get_install_dir t2scan)/usr/bin/t2scan $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir t2scan)/usr/bin/t2scan ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # w_scan
-    cp -P $(get_install_dir w_scan)/usr/bin/w_scan $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir w_scan)/usr/bin/w_scan ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk
index ce20ab9e1a..a7977f8d52 100644
--- a/packages/addons/tools/ffmpeg-tools/package.mk
+++ b/packages/addons/tools/ffmpeg-tools/package.mk
@@ -18,6 +18,6 @@ PKG_ADDON_NAME="FFmpeg Tools"
 PKG_ADDON_TYPE="xbmc.python.script"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
-  cp -L $(get_install_dir ffmpegx)/usr/local/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
+  cp -L $(get_install_dir ffmpegx)/usr/local/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
diff --git a/packages/addons/tools/game-tools/package.mk b/packages/addons/tools/game-tools/package.mk
index 0153a268f3..8d4ba7507c 100644
--- a/packages/addons/tools/game-tools/package.mk
+++ b/packages/addons/tools/game-tools/package.mk
@@ -24,19 +24,19 @@ PKG_DEPENDS_TARGET="toolchain \
                     linuxconsoletools"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
     # bchunk
-    cp -P $(get_install_dir bchunk)/usr/bin/bchunk $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir bchunk)/usr/bin/bchunk ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # ecm-tools
-    cp -P $(get_install_dir ecm-tools)/usr/bin/bin2ecm $ADDON_BUILD/$PKG_ADDON_ID/bin
-    ln -s bin2ecm $ADDON_BUILD/$PKG_ADDON_ID/bin/ecm2bin
+    cp -P $(get_install_dir ecm-tools)/usr/bin/bin2ecm ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    ln -s bin2ecm ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ecm2bin
 
     # iat
-    cp -P $(get_install_dir iat)/usr/bin/iat $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir iat)/usr/bin/iat ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # linuxconsoletools
-    cp -P $(get_install_dir linuxconsoletools)/usr/bin/fftest $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir linuxconsoletools)/usr/bin/jscal $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir linuxconsoletools)/usr/bin/jstest $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir linuxconsoletools)/usr/bin/fftest ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir linuxconsoletools)/usr/bin/jscal ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir linuxconsoletools)/usr/bin/jstest ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
diff --git a/packages/addons/tools/jre.zulu/package.mk b/packages/addons/tools/jre.zulu/package.mk
index 8185b4508e..7ee16e1ccb 100644
--- a/packages/addons/tools/jre.zulu/package.mk
+++ b/packages/addons/tools/jre.zulu/package.mk
@@ -9,26 +9,26 @@ PKG_DEPENDS_TARGET="jre-libbluray libXext chrome-libXtst chrome-libXi chrome-lib
 PKG_DEPENDS_UNPACK="jdk-${TARGET_ARCH}-zulu"
 PKG_SECTION="tools"
 PKG_SHORTDESC="Java Runtime Environment 8 for Blu-ray Disc Java menus from Azul Systems."
-PKG_LONGDESC="$PKG_SHORTDESC"
+PKG_LONGDESC="${PKG_SHORTDESC}"
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="JRE for BD-J menus"
 PKG_ADDON_TYPE="xbmc.python.script"
 
-# find $1.so.[0-9]* in $2 and copy it to dest
+# find ${1}.so.[0-9]* in ${2} and copy it to dest
 _pkg_copy_lib() {
-  find "$2/usr/lib" -regextype sed -regex ".*/$1\.so\.[0-9]*" \
-    -exec cp {} "$ADDON_BUILD/$PKG_ADDON_ID/lib" \;
+  find "${2}/usr/lib" -regextype sed -regex ".*/${1}\.so\.[0-9]*" \
+    -exec cp {} "${ADDON_BUILD}/${PKG_ADDON_ID}/lib" \;
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
 
   cp -a $(get_build_dir jdk-${TARGET_ARCH}-zulu)/jre \
         $(get_install_dir jre-libbluray)/usr/share/java/*.jar \
         ${PKG_DIR}/profile.d \
-    $ADDON_BUILD/$PKG_ADDON_ID
+    ${ADDON_BUILD}/${PKG_ADDON_ID}
 
   # copy required libraries for JRE
   _pkg_copy_lib libXtst $(get_install_dir chrome-libXtst)
@@ -36,7 +36,7 @@ addon() {
   _pkg_copy_lib libXrender $(get_install_dir chrome-libXrender)
   _pkg_copy_lib libXinerama $(get_install_dir jre-libXinerama)
 
-  if [ "$TARGET_ARCH" = "arm" ]; then
+  if [ "${TARGET_ARCH}" = "arm" ]; then
     _pkg_copy_lib libX11 $(get_install_dir libX11)
     _pkg_copy_lib libXext $(get_install_dir libXext)
   fi
diff --git a/packages/addons/tools/multimedia-tools/package.mk b/packages/addons/tools/multimedia-tools/package.mk
index 6a4c0aa318..693c41c907 100644
--- a/packages/addons/tools/multimedia-tools/package.mk
+++ b/packages/addons/tools/multimedia-tools/package.mk
@@ -27,25 +27,25 @@ PKG_DEPENDS_TARGET="toolchain \
                     tstools"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
     # alsamixer
-    cp -P $(get_install_dir alsa-utils)/.noinstall/alsamixer $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp -P $(get_install_dir alsa-utils)/.noinstall/alsamixer ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 
     # mediainfo
-    cp -P $(get_install_dir mediainfo)/usr/bin/mediainfo $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir mediainfo)/usr/bin/mediainfo ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # mpg123
-    cp -P $(get_install_dir mpg123)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp -P $(get_install_dir mpg123)/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 
     # opencaster
-    cp -P $(get_install_dir opencaster)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp -P $(get_install_dir opencaster)/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 
     # squeezelite
-    cp -P $(get_install_dir squeezelite)/usr/bin/squeezelite $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp -P $(get_install_dir squeezelite)/usr/bin/squeezelite ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 
     # tsdecrypt
-    cp -P $(get_install_dir tsdecrypt)/usr/bin/tsdecrypt $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir tsdecrypt)/usr/bin/tsdecrypt ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # tstools
-    cp -P $(get_install_dir tstools)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp -P $(get_install_dir tstools)/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 }
diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk
index 86c606cccb..5431960438 100644
--- a/packages/addons/tools/network-tools/package.mk
+++ b/packages/addons/tools/network-tools/package.mk
@@ -34,56 +34,56 @@ PKG_DEPENDS_TARGET="toolchain \
                     wireless_tools"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
     # bwm-ng
-    cp -P $(get_install_dir bwm-ng)/usr/bin/bwm-ng $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir bwm-ng)/usr/bin/bwm-ng ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # iftop
-    cp -P $(get_install_dir iftop)/usr/sbin/iftop $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir iftop)/usr/sbin/iftop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # iperf
-    cp -P $(get_install_dir iperf)/usr/bin/iperf3 $ADDON_BUILD/$PKG_ADDON_ID/bin
-    ln -s iperf3 $ADDON_BUILD/$PKG_ADDON_ID/bin/iperf
+    cp -P $(get_install_dir iperf)/usr/bin/iperf3 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    ln -s iperf3 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iperf
 
     # irssi
-    cp -P $(get_install_dir irssi)/usr/bin/irssi $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir irssi)/usr/bin/irssi ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # lftp
-    cp -P $(get_install_dir lftp)/usr/bin/lftp $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir lftp)/usr/bin/lftp ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # ncftp
-    cp -P $(get_install_dir ncftp)/usr/bin/ncftp $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir ncftp)/usr/bin/ncftpbatch $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir ncftp)/usr/bin/ncftpget $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir ncftp)/usr/bin/ncftpls $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir ncftp)/usr/bin/ncftpput $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir ncftp)/usr/bin/ncftp ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir ncftp)/usr/bin/ncftpbatch ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir ncftp)/usr/bin/ncftpget ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir ncftp)/usr/bin/ncftpls ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir ncftp)/usr/bin/ncftpput ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # ngrep
-    cp -P $(get_install_dir ngrep)/usr/bin/ngrep $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir ngrep)/usr/bin/ngrep ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # nmap
-    cp -P $(get_install_dir nmap)/usr/bin/nmap $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir nmap)/usr/bin/nmap ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # rar2fs
-    cp -P $(get_install_dir rar2fs)/usr/bin/mkr2i $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir rar2fs)/usr/bin/rar2fs $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir rar2fs)/usr/bin/mkr2i ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir rar2fs)/usr/bin/rar2fs ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # rsync
-    cp -P $(get_install_dir rsync)/usr/bin/rsync $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir rsync)/usr/bin/rsync ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # sshfs
-    cp -P $(get_install_dir sshfs)/usr/bin/sshfs $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir sshfs)/usr/bin/sshfs ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # tcpdump
-    cp -P $(get_install_dir tcpdump)/usr/bin/tcpdump $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir tcpdump)/usr/bin/tcpdump ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # udpxy
-    cp -P $(get_install_dir udpxy)/usr/bin/udpxy $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir udpxy)/usr/bin/udpxy ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # wireless_tools
-    cp -P $(get_install_dir wireless_tools)/usr/sbin/iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin
-    ln -s iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin/iwgetid
-    ln -s iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin/iwlist
-    ln -s iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin/iwspy
-    ln -s iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin/iwpriv
+    cp -P $(get_install_dir wireless_tools)/usr/sbin/iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwgetid
+    ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwlist
+    ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwspy
+    ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwpriv
 }
diff --git a/packages/addons/tools/rpi-tools/package.mk b/packages/addons/tools/rpi-tools/package.mk
index 8bebe66d6e..44b7517b6c 100644
--- a/packages/addons/tools/rpi-tools/package.mk
+++ b/packages/addons/tools/rpi-tools/package.mk
@@ -21,10 +21,10 @@ PKG_ADDON_PROJECTS="RPi ARM"
 
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/RPi/
-    cp -PR $(get_build_dir RPi.GPIO)/build/lib.linux-*/RPi/* $ADDON_BUILD/$PKG_ADDON_ID/lib/RPi
-    cp -PR $(get_build_dir gpiozero)/gpiozero $ADDON_BUILD/$PKG_ADDON_ID/lib/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/RPi/
+    cp -PR $(get_build_dir RPi.GPIO)/build/lib.linux-*/RPi/* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/RPi
+    cp -PR $(get_build_dir gpiozero)/gpiozero ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
-    cp -P $(get_build_dir lan951x-led-ctl)/lan951x-led-ctl $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
+    cp -P $(get_build_dir lan951x-led-ctl)/lan951x-led-ctl ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk
index 62d806989d..555b309196 100644
--- a/packages/addons/tools/system-tools/package.mk
+++ b/packages/addons/tools/system-tools/package.mk
@@ -50,117 +50,117 @@ PKG_DEPENDS_TARGET="toolchain \
                     usb-modeswitch \
                     vim"
 
-if [ "$TARGET_ARCH" = "x86_64" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET efibootmgr st"
+if [ "${TARGET_ARCH}" = "x86_64" ]; then
+  PKG_DEPENDS_TARGET+=" efibootmgr st"
 fi
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/{bin,data,lib}
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,data,lib}
 
     # autossh
-    cp -P $(get_install_dir autossh)/usr/bin/autossh $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir autossh)/usr/bin/autossh ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # diffutils
-    cp -P $(get_install_dir diffutils)/usr/bin/{cmp,diff,diff3,sdiff} $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir diffutils)/usr/bin/{cmp,diff,diff3,sdiff} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # dstat
-    cp -P $(get_install_dir dstat)/usr/bin/dstat $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir dstat)/usr/bin/dstat ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # dtach
-    cp -P $(get_install_dir dtach)/usr/bin/dtach $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir dtach)/usr/bin/dtach ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # efibootmgr
-    cp -P $(get_install_dir efibootmgr)/usr/bin/efibootmgr $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
+    cp -P $(get_install_dir efibootmgr)/usr/bin/efibootmgr ${ADDON_BUILD}/${PKG_ADDON_ID}/bin 2>/dev/null || :
 
     # encfs
-    cp -P $(get_install_dir encfs)/usr/bin/{encfs,encfsctl} $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir encfs)/usr/bin/{encfs,encfsctl} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # evtest
-    cp -P $(get_install_dir evtest)/usr/bin/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir evtest)/usr/bin/evtest ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # fdupes
-    cp -P $(get_install_dir fdupes)/usr/bin/fdupes $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir fdupes)/usr/bin/fdupes ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # file
-    cp -P $(get_install_dir file)/usr/bin/file $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir file)/usr/share/misc/magic.mgc $ADDON_BUILD/$PKG_ADDON_ID/data
+    cp -P $(get_install_dir file)/usr/bin/file ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir file)/usr/share/misc/magic.mgc ${ADDON_BUILD}/${PKG_ADDON_ID}/data
 
     # getscancodes
-    cp -P $(get_install_dir getscancodes)/usr/bin/getscancodes $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir getscancodes)/usr/bin/getscancodes ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # hddtemp
-    cp -P $(get_install_dir hddtemp)/usr/sbin/hddtemp $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir hddtemp)/usr/share/misc/hddtemp.db $ADDON_BUILD/$PKG_ADDON_ID/data
+    cp -P $(get_install_dir hddtemp)/usr/sbin/hddtemp ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir hddtemp)/usr/share/misc/hddtemp.db ${ADDON_BUILD}/${PKG_ADDON_ID}/data
 
     # hd-idle
-    cp -P $(get_install_dir hd-idle)/usr/sbin/hd-idle $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir hd-idle)/usr/sbin/hd-idle ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # hid_mapper
-    cp -P $(get_install_dir hid_mapper)/usr/bin/hid_mapper $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir hid_mapper)/usr/bin/hid_mapper ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # htop
-    cp -P $(get_install_dir htop)/usr/bin/htop $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir htop)/usr/bin/htop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # i2c-tools
-    cp -P $(get_install_dir i2c-tools)/usr/sbin/{i2cdetect,i2cdump,i2cget,i2cset} $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir i2c-tools)/usr/lib/$PKG_PYTHON_VERSION/site-packages/smbus.so $ADDON_BUILD/$PKG_ADDON_ID/lib
+    cp -P $(get_install_dir i2c-tools)/usr/sbin/{i2cdetect,i2cdump,i2cget,i2cset} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir i2c-tools)/usr/lib/${PKG_PYTHON_VERSION}/site-packages/smbus.so ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
 
     # inotify-tools
-    cp -P $(get_install_dir inotify-tools)/usr/bin/{inotifywait,inotifywatch} $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir inotify-tools)/usr/bin/{inotifywait,inotifywatch} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # jq
-    cp -P $(get_install_dir jq)/usr/bin/jq $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir oniguruma)/usr/lib/{libonig.so,libonig.so.5,libonig.so.5.1.0} $ADDON_BUILD/$PKG_ADDON_ID/lib
+    cp -P $(get_install_dir jq)/usr/bin/jq ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_install_dir oniguruma)/usr/lib/{libonig.so,libonig.so.5,libonig.so.5.1.0} ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
 
     # lm_sensors
-    cp -P $(get_install_dir lm_sensors)/usr/bin/sensors $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
+    cp -P $(get_install_dir lm_sensors)/usr/bin/sensors ${ADDON_BUILD}/${PKG_ADDON_ID}/bin 2>/dev/null || :
 
     # lshw
-    cp -P $(get_install_dir lshw)/usr/sbin/lshw $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir lshw)/usr/sbin/lshw ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # mc
-    cp -Pa $(get_install_dir mc)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
-    cp -Pa $(get_install_dir mc)/storage/.kodi/addons/virtual.system-tools/* $ADDON_BUILD/$PKG_ADDON_ID
+    cp -Pa $(get_install_dir mc)/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
+    cp -Pa $(get_install_dir mc)/storage/.kodi/addons/virtual.system-tools/* ${ADDON_BUILD}/${PKG_ADDON_ID}
 
     # mtpfs
-    cp -P $(get_install_dir mtpfs)/usr/bin/mtpfs $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp -P $(get_install_dir mtpfs)/usr/bin/mtpfs ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 
     # nmon
-    cp -P $(get_install_dir nmon)/usr/bin/nmon $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp -P $(get_install_dir nmon)/usr/bin/nmon ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 
     # p7zip
-    mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/p7zip
-    cp -P $(get_install_dir p7zip)/usr/bin/{7z,7za,7z.so} $ADDON_BUILD/$PKG_ADDON_ID/lib/p7zip
-    cp -PR $(get_install_dir p7zip)/usr/bin/Codecs $ADDON_BUILD/$PKG_ADDON_ID/lib/p7zip
+    mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/p7zip
+    cp -P $(get_install_dir p7zip)/usr/bin/{7z,7za,7z.so} ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/p7zip
+    cp -PR $(get_install_dir p7zip)/usr/bin/Codecs ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/p7zip
 
     # patch
-    cp -P $(get_install_dir patch)/usr/bin/patch $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir patch)/usr/bin/patch ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # pv
-    cp -P $(get_install_dir pv)/usr/bin/pv $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir pv)/usr/bin/pv ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # screen
-    cp -L $(get_install_dir screen)/usr/bin/screen $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -L $(get_install_dir screen)/usr/bin/screen ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # smartmontools
-    cp -P $(get_install_dir smartmontools)/usr/sbin/smartctl $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir smartmontools)/usr/sbin/smartctl ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # st
-    cp -P $(get_build_dir st)/st $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
+    cp -P $(get_build_dir st)/st ${ADDON_BUILD}/${PKG_ADDON_ID}/bin 2>/dev/null || :
 
     # strace
-    cp -P $(get_install_dir strace)/usr/bin/strace $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir strace)/usr/bin/strace ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # stress-ng
-    cp -P $(get_install_dir stress-ng)/usr/bin/stress-ng $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir stress-ng)/usr/bin/stress-ng ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # unrar
-    cp -P $(get_install_dir unrar)/usr/bin/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir unrar)/usr/bin/unrar ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # usb-modeswitch
-    cp -P $(get_install_dir usb-modeswitch)/usr/sbin/usb_modeswitch $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir usb-modeswitch)/usr/sbin/usb_modeswitch ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
     # vim
-    cp -P $(get_install_dir vim)/usr/bin/vim $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -Pa $(get_install_dir vim)/storage/.kodi/addons/virtual.system-tools/data/vim/ $ADDON_BUILD/$PKG_ADDON_ID/data
+    cp -P $(get_install_dir vim)/usr/bin/vim ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -Pa $(get_install_dir vim)/storage/.kodi/addons/virtual.system-tools/data/vim/ ${ADDON_BUILD}/${PKG_ADDON_ID}/data
 }