network: automated code cleanup

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
2026-03-31 14:41:55 -07:00 · 2021-01-19 19:34:12 +00:00
parent e6217f9b01
commit 3baf91e87d
25 changed files with 176 additions and 176 deletions
--- a/packages/network/avahi/package.mk
+++ b/packages/network/avahi/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="0.8"
 PKG_SHA256="c15e750ef7c6df595fb5f2ce10cac0fee2353649600e6919ad08ae8871e4945f"
 PKG_LICENSE="GPL"
 PKG_SITE="http://avahi.org/"
-PKG_URL="https://github.com/lathiat/avahi/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/lathiat/avahi/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain expat libdaemon dbus connman gettext"
 PKG_LONGDESC="Service Discovery for Linux using mDNS/DNS-SD, compatible with Bonjour."
 PKG_TOOLCHAIN="configure"
@@ -60,31 +60,31 @@ pre_configure_target() {

 post_makeinstall_target() {
 # disable wide-area
-  sed -e "s,^.*enable-wide-area=.*$,enable-wide-area=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
+  sed -e "s,^.*enable-wide-area=.*$,enable-wide-area=no,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf
 # publish-hinfo
-  sed -e "s,^.*publish-hinfo=.*$,publish-hinfo=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
+  sed -e "s,^.*publish-hinfo=.*$,publish-hinfo=no,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf
 # publish-workstation
-  sed -e "s,^.*publish-workstation=.*$,publish-workstation=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
+  sed -e "s,^.*publish-workstation=.*$,publish-workstation=no,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf
 # browse domains?
-  sed -e "s,^.*browse-domains=.*$,# browse-domains=,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
+  sed -e "s,^.*browse-domains=.*$,# browse-domains=,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf
 # set root user as default
-  sed -e "s,<port>22</port>,<port>22</port>\n    <txt-record>path=/storage</txt-record>\n    <txt-record>u=root</txt-record>,g" -i $INSTALL/etc/avahi/services/sftp-ssh.service
+  sed -e "s,<port>22</port>,<port>22</port>\n    <txt-record>path=/storage</txt-record>\n    <txt-record>u=root</txt-record>,g" -i ${INSTALL}/etc/avahi/services/sftp-ssh.service

-  rm -rf $INSTALL/etc/avahi/avahi-dnsconfd.action
-  rm -rf $INSTALL/etc/avahi/services/ssh.service
-  if [ ! $SFTP_SERVER = "yes" ]; then
-    rm -rf $INSTALL/etc/avahi/services/sftp-ssh.service
+  rm -rf ${INSTALL}/etc/avahi/avahi-dnsconfd.action
+  rm -rf ${INSTALL}/etc/avahi/services/ssh.service
+  if [ ! ${SFTP_SERVER} = "yes" ]; then
+    rm -rf ${INSTALL}/etc/avahi/services/sftp-ssh.service
  fi
-  rm -rf $INSTALL/usr/lib/systemd
-  rm -f $INSTALL/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
-  rm -f $INSTALL/usr/sbin/avahi-dnsconfd
-  rm -f $INSTALL/usr/bin/avahi-bookmarks
-  rm -f $INSTALL/usr/bin/avahi-publish*
-  rm -f $INSTALL/usr/bin/avahi-resolve*
-  rm -f $INSTALL/usr/lib/libdns_sd*
+  rm -rf ${INSTALL}/usr/lib/systemd
+  rm -f ${INSTALL}/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
+  rm -f ${INSTALL}/usr/sbin/avahi-dnsconfd
+  rm -f ${INSTALL}/usr/bin/avahi-bookmarks
+  rm -f ${INSTALL}/usr/bin/avahi-publish*
+  rm -f ${INSTALL}/usr/bin/avahi-resolve*
+  rm -f ${INSTALL}/usr/lib/libdns_sd*

-  mkdir -p $INSTALL/usr/share/services
-    cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services
+  mkdir -p ${INSTALL}/usr/share/services
+    cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services
 }

 post_install() {
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -19,7 +19,7 @@ else
  BLUEZ_CONFIG="--disable-debug"
 fi

-BLUEZ_CONFIG="$BLUEZ_CONFIG --enable-monitor --enable-test"
+BLUEZ_CONFIG+=" --enable-monitor --enable-test"

 PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
                           --disable-silent-rules \
@@ -34,35 +34,35 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
                           --disable-experimental \
                           --enable-sixaxis \
                           --with-gnu-ld \
-                           $BLUEZ_CONFIG \
+                           ${BLUEZ_CONFIG} \
                           storagedir=/storage/.cache/bluetooth"

 pre_configure_target() {
 # bluez fails to build in subdirs
-  cd $PKG_BUILD
-    rm -rf .$TARGET_NAME
+  cd ${PKG_BUILD}
+    rm -rf .${TARGET_NAME}

  export LIBS="-lncurses"
 }

 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/lib/systemd
-  rm -rf $INSTALL/usr/bin/bccmd
-  rm -rf $INSTALL/usr/bin/bluemoon
-  rm -rf $INSTALL/usr/bin/ciptool
-  rm -rf $INSTALL/usr/share/dbus-1
+  rm -rf ${INSTALL}/usr/lib/systemd
+  rm -rf ${INSTALL}/usr/bin/bccmd
+  rm -rf ${INSTALL}/usr/bin/bluemoon
+  rm -rf ${INSTALL}/usr/bin/ciptool
+  rm -rf ${INSTALL}/usr/share/dbus-1

-  mkdir -p $INSTALL/etc/bluetooth
-    cp src/main.conf $INSTALL/etc/bluetooth
-    sed -i $INSTALL/etc/bluetooth/main.conf \
+  mkdir -p ${INSTALL}/etc/bluetooth
+    cp src/main.conf ${INSTALL}/etc/bluetooth
+    sed -i ${INSTALL}/etc/bluetooth/main.conf \
        -e "s|^#\[Policy\]|\[Policy\]|g" \
        -e "s|^#AutoEnable.*|AutoEnable=true|g"

-  mkdir -p $INSTALL/usr/share/services
-    cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services
+  mkdir -p ${INSTALL}/usr/share/services
+    cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services

  # bluez looks in /etc/firmware/
-    ln -sf /usr/lib/firmware $INSTALL/etc/firmware
+    ln -sf /usr/lib/firmware ${INSTALL}/etc/firmware
 }

 post_install() {
--- a/packages/network/connman/package.mk
+++ b/packages/network/connman/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="40947be3848b0a864a366f8d67ce347265ea98c4" # 1.38 + HEAD 12/12/20
 PKG_SHA256="d59e93caf297f0ad8d2034fcf956747ba879266e2ad9b7e42abcce86867083e6"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.connman.net"
-PKG_URL="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-$PKG_VERSION.tar.gz"
+PKG_URL="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain glib readline dbus iptables"
 PKG_LONGDESC="A modular network connection manager."
 PKG_TOOLCHAIN="autotools"
@@ -44,13 +44,13 @@ PKG_CONFIGURE_OPTS_TARGET="--srcdir=.. \
                           --with-systemdunitdir=/usr/lib/systemd/system \
                           --disable-silent-rules"

-if [ "$WIREGUARD_SUPPORT" = "yes" ]; then
+if [ "${WIREGUARD_SUPPORT}" = "yes" ]; then
  PKG_CONFIGURE_OPTS_TARGET+=" --enable-wireguard=builtin"
 else
  PKG_CONFIGURE_OPTS_TARGET+=" --disable-wireguard"
 fi

-case "$WIRELESS_DAEMON" in
+case "${WIRELESS_DAEMON}" in
  wpa_supplicant)
    PKG_DEPENDS_TARGET+=" wpa_supplicant"
    PKG_CONFIGURE_OPTS_TARGET+=" WPASUPPLICANT=/usr/bin/wpa_supplicant \
@@ -69,18 +69,18 @@ PKG_MAKE_OPTS_TARGET="storagedir=/storage/.cache/connman \
                      statedir=/run/connman"

 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/lib/systemd
-  rm -rf $INSTALL/usr/lib/tmpfiles.d/connman_resolvconf.conf
+  rm -rf ${INSTALL}/usr/lib/systemd
+  rm -rf ${INSTALL}/usr/lib/tmpfiles.d/connman_resolvconf.conf

-  mkdir -p $INSTALL/usr/bin
-    cp -P client/connmanctl $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+    cp -P client/connmanctl ${INSTALL}/usr/bin

-  mkdir -p $INSTALL/usr/lib/connman
-    cp -P $PKG_DIR/scripts/connman-setup $INSTALL/usr/lib/connman
+  mkdir -p ${INSTALL}/usr/lib/connman
+    cp -P ${PKG_DIR}/scripts/connman-setup ${INSTALL}/usr/lib/connman

-  mkdir -p $INSTALL/etc/connman
-    cp ../src/main.conf $INSTALL/etc/connman
-    sed -i $INSTALL/etc/connman/main.conf \
+  mkdir -p ${INSTALL}/etc/connman
+    cp ../src/main.conf ${INSTALL}/etc/connman
+    sed -i ${INSTALL}/etc/connman/main.conf \
        -e "s|^# BackgroundScanning.*|BackgroundScanning = true|g" \
        -e "s|^# UseGatewaysAsTimeservers.*|UseGatewaysAsTimeservers = false|g" \
        -e "s|^# FallbackNameservers.*|FallbackNameservers = 8.8.8.8,8.8.4.4|g" \
@@ -91,8 +91,8 @@ post_makeinstall_target() {
        -e "s|^# PersistentTetheringMode.*|PersistentTetheringMode = true|g" \
        -e "s|^# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb|NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,docker,veth,zt|g"

-  mkdir -p $INSTALL/usr/share/connman/
-    cp $PKG_DIR/config/settings $INSTALL/usr/share/connman/
+  mkdir -p ${INSTALL}/usr/share/connman/
+    cp ${PKG_DIR}/config/settings ${INSTALL}/usr/share/connman/
 }

 post_install() {
@@ -100,7 +100,7 @@ post_install() {
  add_group system 430

  enable_service connman.service
-  if [ "$WIREGUARD_SUPPORT" = "yes" ]; then
+  if [ "${WIREGUARD_SUPPORT}" = "yes" ]; then
    enable_service connman-vpn.service
  fi
 }
--- a/packages/network/ethtool/package.mk
+++ b/packages/network/ethtool/package.mk
@@ -7,6 +7,6 @@ PKG_VERSION="5.10"
 PKG_SHA256="817d5396a9307b4c637b435d4c558b8f5f964a1464a035ca3c0180f4cc93cfcf"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/"
-PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://www.kernel.org/pub/software/network/ethtool/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libmnl"
 PKG_LONGDESC="Ethtool is used for querying settings of an ethernet device and changing them."
--- a/packages/network/iptables/package.mk
+++ b/packages/network/iptables/package.mk
@@ -7,20 +7,20 @@ PKG_VERSION="1.8.6"
 PKG_SHA256="a0f4fe0c3eb8faa5bd9c8376d132f340b9558e750c91deb2d5028aa3d0047767"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.netfilter.org/"
-PKG_URL="http://www.netfilter.org/projects/iptables/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.netfilter.org/projects/iptables/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain linux:host libmnl libnftnl"
 PKG_LONGDESC="IP packet filter administration."
 PKG_TOOLCHAIN="autotools"

 post_makeinstall_target() {
-  mkdir -p $INSTALL/usr/config/iptables/
-    cp -PR $PKG_DIR/config/README $INSTALL/usr/config/iptables/
+  mkdir -p ${INSTALL}/usr/config/iptables/
+    cp -PR ${PKG_DIR}/config/README ${INSTALL}/usr/config/iptables/

-  mkdir -p $INSTALL/etc/iptables/
-    cp -PR $PKG_DIR/config/* $INSTALL/etc/iptables/
+  mkdir -p ${INSTALL}/etc/iptables/
+    cp -PR ${PKG_DIR}/config/* ${INSTALL}/etc/iptables/

-  mkdir -p $INSTALL/usr/lib/libreelec
-    cp $PKG_DIR/scripts/iptables_helper $INSTALL/usr/lib/libreelec
+  mkdir -p ${INSTALL}/usr/lib/libreelec
+    cp ${PKG_DIR}/scripts/iptables_helper ${INSTALL}/usr/lib/libreelec
 }

 post_install() {
--- a/packages/network/iw/package.mk
+++ b/packages/network/iw/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="5.9"
 PKG_SHA256="293a07109aeb7e36267cf59e3ce52857e9ffae3a6666eb8ac77894b1839fe1f2"
 PKG_LICENSE="PUBLIC_DOMAIN"
 PKG_SITE="http://wireless.kernel.org/en/users/Documentation/iw"
-PKG_URL="https://www.kernel.org/pub/software/network/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://www.kernel.org/pub/software/network/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libnl"
 PKG_LONGDESC="A new nl80211 based CLI configuration utility for wireless devices."
 # iw fails at runtime with lto enabled

 pre_configure_target() {
-  export LDFLAGS="$LDFLAGS -pthread"
+  export LDFLAGS="${LDFLAGS} -pthread"
 }

 post_makeinstall_target() {
-  mkdir -p $INSTALL/usr/lib/iw
-    cp $PKG_DIR/scripts/setregdomain $INSTALL/usr/lib/iw
+  mkdir -p ${INSTALL}/usr/lib/iw
+    cp ${PKG_DIR}/scripts/setregdomain ${INSTALL}/usr/lib/iw
 }
--- a/packages/network/iwd/package.mk
+++ b/packages/network/iwd/package.mk
@@ -33,7 +33,7 @@ post_makeinstall_target() {
      -e 's|^\(ProtectControlGroups=.*\)$|#\1|g' \
      -e 's|^\(ProtectKernelModules=.*\)$|#\1|g' \
      -e 's|^\(ConfigurationDirectory=.*\)$|#\1|g' \
-      -i $INSTALL/usr/lib/systemd/system/iwd.service
+      -i ${INSTALL}/usr/lib/systemd/system/iwd.service
 }

 post_install() {
--- a/packages/network/libdnet/package.mk
+++ b/packages/network/libdnet/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="1.14"
 PKG_SHA256="592599c54a57102a177270f3a2caabda2c2ac7768b977d7458feba97da923dfe"
 PKG_LICENSE="BSD"
 PKG_SITE="https://github.com/ofalk/libdnet"
-PKG_URL="https://github.com/ofalk/libdnet/archive/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/ofalk/libdnet/archive/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A simplified, portable interface to several low-level networking routines"
 PKG_TOOLCHAIN="autotools"
@@ -20,10 +20,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_strlcat=no \
                           --disable-python"

 pre_configure_target() {
-  export CFLAGS+=" -I$PKG_BUILD/include"
+  export CFLAGS+=" -I${PKG_BUILD}/include"
 }

 post_makeinstall_target() {
-  cp $SYSROOT_PREFIX/usr/bin/dnet-config \
-     $TOOLCHAIN/bin/dnet-config
+  cp ${SYSROOT_PREFIX}/usr/bin/dnet-config \
+     ${TOOLCHAIN}/bin/dnet-config
 }
--- a/packages/network/libmnl/package.mk
+++ b/packages/network/libmnl/package.mk
@@ -6,6 +6,6 @@ PKG_VERSION="1.0.4"
 PKG_SHA256="171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81"
 PKG_LICENSE="GPL"
 PKG_SITE="http://netfilter.org/projects/libmnl"
-PKG_URL="http://netfilter.org/projects/libmnl/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://netfilter.org/projects/libmnl/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A minimalistic user-space library oriented to Netlink developers."
--- a/packages/network/libnfs/package.mk
+++ b/packages/network/libnfs/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="4.0.0"
 PKG_SHA256="6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d"
 PKG_LICENSE="LGPL2.1+"
 PKG_SITE="https://github.com/sahlberg/libnfs"
-PKG_URL="https://github.com/sahlberg/libnfs/archive/libnfs-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/sahlberg/libnfs/archive/libnfs-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A client library for accessing NFS shares over a network."
 PKG_TOOLCHAIN="autotools"
@@ -15,5 +15,5 @@ PKG_TOOLCHAIN="autotools"
 PKG_CONFIGURE_OPTS_TARGET="--disable-examples"

 pre_configure_target() {
-  export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
+  export CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64"
 }
--- a/packages/network/libnftnl/package.mk
+++ b/packages/network/libnftnl/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="1.1.8"
 PKG_SHA256="04a3fa5b08b736268f7e65836b9f05d9d5f438181467bee3c76c3c4a4f3ab711"
 PKG_LICENSE="GPL"
 PKG_SITE="http://netfilter.org/projects/libnftnl"
-PKG_URL="http://netfilter.org/projects/libnftnl/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://netfilter.org/projects/libnftnl/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libmnl"
 PKG_LONGDESC="A userspace library providing a low-level netlink programming interface (API) to the in-kernel nf_tables subsystem."

--- a/packages/network/libnl/package.mk
+++ b/packages/network/libnl/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="3.5.0"
 PKG_SHA256="352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://github.com/thom311/libnl"
-PKG_URL="https://github.com/thom311/libnl/releases/download/libnl${PKG_VERSION//./_}/libnl-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/thom311/libnl/releases/download/libnl${PKG_VERSION//./_}/libnl-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A library for applications dealing with netlink socket."

--- a/packages/network/libshairplay/package.mk
+++ b/packages/network/libshairplay/package.mk
@@ -7,16 +7,16 @@ PKG_VERSION="096b61ad14c90169f438e690d096e3fcf87e504e"
 PKG_SHA256="7e2b013ffe75ea2f13fb12b1aa38b8e2e8b1899ac292d57f05d7b352a3a181cf"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/juhovh/shairplay"
-PKG_URL="https://github.com/juhovh/shairplay/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/juhovh/shairplay/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain avahi"
 PKG_LONGDESC="Apple airplay and raop protocol server"
 PKG_TOOLCHAIN="autotools"

 pre_configure_target() {
-  CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/avahi-compat-libdns_sd"
+  CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/avahi-compat-libdns_sd"
 }

 post_makeinstall_target() {
-  mkdir -p $INSTALL/etc/shairplay
-    cp -P ../airport.key $INSTALL/etc/shairplay
+  mkdir -p ${INSTALL}/etc/shairplay
+    cp -P ../airport.key ${INSTALL}/etc/shairplay
 }
--- a/packages/network/libssh/package.mk
+++ b/packages/network/libssh/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="0.9.5"
 PKG_SHA256="acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.libssh.org/"
-PKG_URL="https://www.libssh.org/files/$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://www.libssh.org/files/$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain zlib openssl"
 PKG_LONGDESC="Library for accessing ssh client services through C libraries."

@@ -20,14 +20,14 @@ PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \

 makeinstall_target() {
 # install static library only
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp $PKG_BUILD/.$TARGET_NAME/src/libssh.a $SYSROOT_PREFIX/usr/lib
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib
+    cp ${PKG_BUILD}/.${TARGET_NAME}/src/libssh.a ${SYSROOT_PREFIX}/usr/lib

-  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
-    cp $PKG_BUILD/.$TARGET_NAME/libssh.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
+    cp ${PKG_BUILD}/.${TARGET_NAME}/libssh.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig

-  mkdir -p $SYSROOT_PREFIX/usr/include/libssh
-    cp $PKG_BUILD/include/libssh/{callbacks.h,legacy.h,libssh.h,server.h,sftp.h,ssh2.h} \
-       $PKG_BUILD/.$TARGET_NAME/include/libssh/libssh_version.h \
-    $SYSROOT_PREFIX/usr/include/libssh
+  mkdir -p ${SYSROOT_PREFIX}/usr/include/libssh
+    cp ${PKG_BUILD}/include/libssh/{callbacks.h,legacy.h,libssh.h,server.h,sftp.h,ssh2.h} \
+       ${PKG_BUILD}/.${TARGET_NAME}/include/libssh/libssh_version.h \
+    ${SYSROOT_PREFIX}/usr/include/libssh
 }
--- a/packages/network/libtirpc/package.mk
+++ b/packages/network/libtirpc/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="1.3.1"
 PKG_SHA256="245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17"
 PKG_LICENSE="GPL"
 PKG_SITE="https://sourceforge.net/projects/libtirpc/"
-PKG_URL="https://downloads.sourceforge.net/project/libtirpc/libtirpc/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="https://downloads.sourceforge.net/project/libtirpc/libtirpc/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A port of Suns Transport-Independent RPC library to Linux."
 PKG_BUILD_FLAGS="+pic"
--- a/packages/network/netbase/package.mk
+++ b/packages/network/netbase/package.mk
@@ -6,13 +6,13 @@ PKG_VERSION="6.2"
 PKG_SHA256="309a24146a06347d654b261e9e07a82fab844b173674a42e223803dd8258541e"
 PKG_LICENSE="GPL"
 PKG_SITE="https://salsa.debian.org/md/netbase"
-PKG_URL="http://ftp.debian.org/debian/pool/main/n/netbase/netbase_$PKG_VERSION.tar.xz"
+PKG_URL="http://ftp.debian.org/debian/pool/main/n/netbase/netbase_${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="The netbase package provides data for network services and protocols from the iana db."
 PKG_TOOLCHAIN="manual"

 makeinstall_target() {
-  mkdir -p $INSTALL/etc
-    cp etc/protocols $INSTALL/etc
-    cp etc/services $INSTALL/etc
+  mkdir -p ${INSTALL}/etc
+    cp etc/protocols ${INSTALL}/etc
+    cp etc/services ${INSTALL}/etc
 }
--- a/packages/network/nss-mdns/package.mk
+++ b/packages/network/nss-mdns/package.mk
@@ -7,12 +7,12 @@ PKG_VERSION="0.14.1"
 PKG_SHA256="4fe54bffd20e410fc41382dc6c4708cdfa3a65f50c3753f262dc4c78fd864a6e"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lathiat/nss-mdns"
-PKG_URL="https://github.com/lathiat/nss-mdns/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/lathiat/nss-mdns/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain avahi"
 PKG_LONGDESC="A plugin for nss to allow name resolution via Multicast DNS."
 PKG_TOOLCHAIN="autotools"

 post_makeinstall_target() {
-  mkdir -p $INSTALL/etc
-  cp $PKG_DIR/config/nsswitch.conf $INSTALL/etc/nsswitch.conf
+  mkdir -p ${INSTALL}/etc
+  cp ${PKG_DIR}/config/nsswitch.conf ${INSTALL}/etc/nsswitch.conf
 }
--- a/packages/network/openssh/package.mk
+++ b/packages/network/openssh/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="8.4p1"
 PKG_SHA256="5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.openssh.com/"
-PKG_URL="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain openssl zlib"
 PKG_LONGDESC="An open re-implementation of the SSH package."
 PKG_TOOLCHAIN="autotools"
@@ -33,25 +33,25 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_rpc_types_h=no \
                           --without-pam"

 pre_configure_target() {
-  export LD="$CC"
-  export LDFLAGS="$TARGET_CFLAGS $TARGET_LDFLAGS"
+  export LD="${CC}"
+  export LDFLAGS="${TARGET_CFLAGS} ${TARGET_LDFLAGS}"
 }

 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/lib/openssh/ssh-keysign
-  rm -rf $INSTALL/usr/lib/openssh/ssh-pkcs11-helper
-  if [ ! $SFTP_SERVER = "yes" ]; then
-    rm -rf $INSTALL/usr/lib/openssh/sftp-server
+  rm -rf ${INSTALL}/usr/lib/openssh/ssh-keysign
+  rm -rf ${INSTALL}/usr/lib/openssh/ssh-pkcs11-helper
+  if [ ! ${SFTP_SERVER} = "yes" ]; then
+    rm -rf ${INSTALL}/usr/lib/openssh/sftp-server
  fi
-  rm -rf $INSTALL/usr/bin/ssh-add
-  rm -rf $INSTALL/usr/bin/ssh-agent
-  rm -rf $INSTALL/usr/bin/ssh-keyscan
+  rm -rf ${INSTALL}/usr/bin/ssh-add
+  rm -rf ${INSTALL}/usr/bin/ssh-agent
+  rm -rf ${INSTALL}/usr/bin/ssh-keyscan

  sed -e "s|^#PermitRootLogin.*|PermitRootLogin yes|g" \
      -e "s|^#StrictModes.*|StrictModes no|g" \
-      -i $INSTALL/etc/ssh/sshd_config
+      -i ${INSTALL}/etc/ssh/sshd_config

-  debug_strip $INSTALL/usr
+  debug_strip ${INSTALL}/usr
 }

 post_install() {
--- a/packages/network/openvpn/package.mk
+++ b/packages/network/openvpn/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.4.10"
 PKG_SHA256="cf285395a679f0b68c0acde2cb2480e8ead6ca07ff14c1bc52ae65a1243aa377"
 PKG_LICENSE="GPL"
 PKG_SITE="https://openvpn.net"
-PKG_URL="https://swupdate.openvpn.org/community/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://swupdate.openvpn.org/community/releases/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain lzo openssl"
 PKG_LONGDESC="A full featured SSL VPN software solution that integrates OpenVPN server capabilities."

@@ -22,6 +22,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_decl_TUNSETPERSIST=no \
                           --disable-debug"

 post_makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-    ln -sf ../sbin/openvpn $INSTALL/usr/bin/openvpn
+  mkdir -p ${INSTALL}/usr/bin
+    ln -sf ../sbin/openvpn ${INSTALL}/usr/bin/openvpn
 }
--- a/packages/network/rpcbind/package.mk
+++ b/packages/network/rpcbind/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="1.2.5"
 PKG_SHA256="2ce360683963b35c19c43f0ee2c7f18aa5b81ef41c3fdbd15ffcb00b8bffda7a"
 PKG_LICENSE="OSS"
 PKG_SITE="http://rpcbind.sourceforge.net/"
-PKG_URL="$SOURCEFORGE_SRC/rpcbind/rpcbind/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="${SOURCEFORGE_SRC}/rpcbind/rpcbind/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libtirpc systemd"
 PKG_LONGDESC="The rpcbind utility is a server that converts RPC program numbers into universal addresses."

--- a/Show More
+++ b/Show More