diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk
index d1ae0e49d6..80079b3f51 100644
--- a/packages/addons/service/hyperion/package.mk
+++ b/packages/addons/service/hyperion/package.mk
@@ -53,7 +53,7 @@ pre_build_target() {
 }
 
 pre_configure_target() {
-  echo "" > ../cmake/FindGitVersion.cmake
+  echo "" >../cmake/FindGitVersion.cmake
 }
 
 addon() {
diff --git a/packages/addons/service/prometheus-node-exporter/package.mk b/packages/addons/service/prometheus-node-exporter/package.mk
index 22cb25a7f3..5953977149 100644
--- a/packages/addons/service/prometheus-node-exporter/package.mk
+++ b/packages/addons/service/prometheus-node-exporter/package.mk
@@ -37,4 +37,3 @@ addon() {
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
   cp -P ${PKG_BUILD}/bin/prometheus-node-exporter ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
-
diff --git a/packages/addons/service/rsyslog/package.mk b/packages/addons/service/rsyslog/package.mk
index 9e0d97b743..16352192ab 100644
--- a/packages/addons/service/rsyslog/package.mk
+++ b/packages/addons/service/rsyslog/package.mk
@@ -43,8 +43,7 @@ addon() {
      ${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)
-  do
+  for l in $(find ${PKG_INSTALL}/usr/lib -name *.so); do
     cp ${l} ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/rsyslog/
   done
 }
diff --git a/packages/addons/service/tigervnc/package.mk b/packages/addons/service/tigervnc/package.mk
index c639b1e1e0..a2e515f812 100644
--- a/packages/addons/service/tigervnc/package.mk
+++ b/packages/addons/service/tigervnc/package.mk
@@ -33,8 +33,8 @@ _pkg_copy_lib() {
 addon() {
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib.private}
 
-  cp ${PKG_BUILD}/.${TARGET_NAME}/unix/vncconfig/vncconfig     \
-     ${PKG_BUILD}/.${TARGET_NAME}/unix/vncpasswd/vncpasswd     \
+  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/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk
index b857c8df7b..7a92068f05 100644
--- a/packages/addons/service/tvheadend42/package.mk
+++ b/packages/addons/service/tvheadend42/package.mk
@@ -86,15 +86,15 @@ pre_configure_target() {
                              --disable-bintray_cache \
                              --python=${TOOLCHAIN}/bin/python"
 
-# fails to build in subdirs
+  # fails to build in subdirs
   cd ${PKG_BUILD}
   rm -rf .${TARGET_NAME}
 
-# pass ffmpegx to build
+  # 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
+  # pass libhdhomerun to build
   CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/hdhomerun"
 
   export CROSS_COMPILE="${TARGET_PREFIX}"
diff --git a/packages/addons/service/tvheadend43/package.mk b/packages/addons/service/tvheadend43/package.mk
index 6e074ee2ba..c7f4546638 100644
--- a/packages/addons/service/tvheadend43/package.mk
+++ b/packages/addons/service/tvheadend43/package.mk
@@ -86,15 +86,15 @@ pre_configure_target() {
                              --disable-bintray_cache \
                              --python=${TOOLCHAIN}/bin/python"
 
-# fails to build in subdirs
+  # fails to build in subdirs
   cd ${PKG_BUILD}
   rm -rf .${TARGET_NAME}
 
-# pass ffmpegx to build
+  # 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
+  # pass libhdhomerun to build
   CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/hdhomerun"
 
   export CROSS_COMPILE="${TARGET_PREFIX}"
diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk
index 37a8e1cf6d..d8239b3ca3 100644
--- a/packages/addons/service/vdr-addon/package.mk
+++ b/packages/addons/service/vdr-addon/package.mk
@@ -37,7 +37,7 @@ addon() {
   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
+  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/* \
diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk
index 4bc5879bd8..71525b1744 100644
--- a/packages/addons/tools/network-tools/package.mk
+++ b/packages/addons/tools/network-tools/package.mk
@@ -101,6 +101,6 @@ addon() {
     ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwspy
     ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwpriv
 
-    find ${ADDON_BUILD}/${PKG_ADDON_ID}/bin -type f | \
+    find ${ADDON_BUILD}/${PKG_ADDON_ID}/bin -type f |
       xargs patchelf --add-rpath '${ORIGIN}/../lib.private'
 }
diff --git a/packages/addons/tools/rpi-tools/package.mk b/packages/addons/tools/rpi-tools/package.mk
index 820829e4db..11feb94027 100644
--- a/packages/addons/tools/rpi-tools/package.mk
+++ b/packages/addons/tools/rpi-tools/package.mk
@@ -19,7 +19,6 @@ PKG_ADDON_NAME="Raspberry Pi Tools"
 PKG_ADDON_TYPE="xbmc.python.module"
 PKG_ADDON_PROJECTS="RPi ARM"
 
-
 addon() {
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
     cp -PR $(get_build_dir lg-gpio)/liblgpio.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk
index c75f69a081..cc44c1e95a 100644
--- a/packages/addons/tools/system-tools/package.mk
+++ b/packages/addons/tools/system-tools/package.mk
@@ -191,6 +191,6 @@ addon() {
     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
 
-    scanelf -EET_EXEC -RBF %F ${ADDON_BUILD}/${PKG_ADDON_ID}/bin | \
+    scanelf -EET_EXEC -RBF %F ${ADDON_BUILD}/${PKG_ADDON_ID}/bin |
       xargs patchelf --add-rpath '${ORIGIN}/../lib.private'
 }