diff --git a/sysa/autoconf-2.52/stage1.sh b/sysa/autoconf-2.52/stage1.sh
index 9ef17ad..5dc21c5 100755
--- a/sysa/autoconf-2.52/stage1.sh
+++ b/sysa/autoconf-2.52/stage1.sh
@@ -15,7 +15,7 @@ src_compile() {
 }
 
 src_install() {
-    install -D autoconf ${DESTDIR}${PREFIX}/bin/autoconf-2.52
-    mkdir -p ${DESTDIR}${PREFIX}/share/autoconf-2.52
-    cp -r *.m4* ${DESTDIR}${PREFIX}/share/autoconf-2.52/
+    install -D autoconf "${DESTDIR}${PREFIX}/bin/autoconf-2.52"
+    mkdir -p "${DESTDIR}${PREFIX}/share/autoconf-2.52"
+    cp -r -- *.m4* "${DESTDIR}${PREFIX}/share/autoconf-2.52/"
 }
diff --git a/sysa/autoconf-2.52/stage2.sh b/sysa/autoconf-2.52/stage2.sh
index 0f4ac28..62cc949 100755
--- a/sysa/autoconf-2.52/stage2.sh
+++ b/sysa/autoconf-2.52/stage2.sh
@@ -4,14 +4,14 @@
 
 src_prepare() {
     rm doc/standards.info doc/autoconf.info
-    rm Makefile.in */Makefile.in
+    rm -- Makefile.in */Makefile.in
     rm configure
     autoconf-2.52
     automake-1.4
 
     # Install autoconf data files into versioned directory
     for file in */Makefile.in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
     done
 }
 
@@ -25,8 +25,8 @@ src_compile() {
 
 src_install() {
     # Remove manually installed autoconf
-    rm ${PREFIX}/bin/autoconf-2.52
-    rm -rf ${PREFIX}/share/autoconf-2.52
+    rm "${PREFIX}/bin/autoconf-2.52"
+    rm -rf "${PREFIX}/share/autoconf-2.52"
 
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
 }
diff --git a/sysa/autoconf-2.53/stage1.sh b/sysa/autoconf-2.53/stage1.sh
index 1d8a14d..48d95b9 100755
--- a/sysa/autoconf-2.53/stage1.sh
+++ b/sysa/autoconf-2.53/stage1.sh
@@ -5,7 +5,7 @@
 src_prepare() {
     default
 
-    rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
+    rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
     rm doc/standards.info doc/autoconf.info
 
     aclocal-1.6
@@ -19,7 +19,7 @@ src_prepare() {
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
     done
 }
 
diff --git a/sysa/autoconf-2.53/stage2.sh b/sysa/autoconf-2.53/stage2.sh
index ab34827..ff1cf1a 100755
--- a/sysa/autoconf-2.53/stage2.sh
+++ b/sysa/autoconf-2.53/stage2.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
+    rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
     rm doc/standards.info doc/autoconf.info
 
     aclocal-1.6
@@ -13,7 +13,7 @@ src_prepare() {
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
     done
 }
 
diff --git a/sysa/autoconf-2.54/stage1.sh b/sysa/autoconf-2.54/stage1.sh
index 45624e7..76e31d2 100755
--- a/sysa/autoconf-2.54/stage1.sh
+++ b/sysa/autoconf-2.54/stage1.sh
@@ -4,7 +4,7 @@
 
 src_prepare() {
     rm bin/autoconf.in
-    rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
+    rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
     rm doc/standards.info doc/autoconf.info
     aclocal-1.7
     sed -i 's/2.54/2.53/' aclocal.m4
@@ -17,7 +17,7 @@ src_prepare() {
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
     done
 }
 
diff --git a/sysa/autoconf-2.54/stage2.sh b/sysa/autoconf-2.54/stage2.sh
index 3c4a977..f0fee4b 100755
--- a/sysa/autoconf-2.54/stage2.sh
+++ b/sysa/autoconf-2.54/stage2.sh
@@ -4,14 +4,14 @@
 
 src_prepare() {
     rm bin/autoconf.in
-    rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
+    rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
     rm doc/standards.info doc/autoconf.info
 
     autoreconf-2.54
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
     done
 }
 
diff --git a/sysa/autoconf-2.55/autoconf-2.55.sh b/sysa/autoconf-2.55/autoconf-2.55.sh
index 7167aaa..c281c01 100755
--- a/sysa/autoconf-2.55/autoconf-2.55.sh
+++ b/sysa/autoconf-2.55/autoconf-2.55.sh
@@ -4,14 +4,14 @@
 
 src_prepare() {
     rm bin/autoconf.in
-    rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
+    rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
     rm doc/standards.info doc/autoconf.info
 
     autoreconf-2.54
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
     done
 }
 
diff --git a/sysa/autoconf-2.57/autoconf-2.57.sh b/sysa/autoconf-2.57/autoconf-2.57.sh
index 5c5746d..c04171a 100755
--- a/sysa/autoconf-2.57/autoconf-2.57.sh
+++ b/sysa/autoconf-2.57/autoconf-2.57.sh
@@ -10,7 +10,7 @@ src_prepare() {
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
     done
 }
 
diff --git a/sysa/autoconf-2.59/autoconf-2.59.sh b/sysa/autoconf-2.59/autoconf-2.59.sh
index 91e950e..c82d480 100755
--- a/sysa/autoconf-2.59/autoconf-2.59.sh
+++ b/sysa/autoconf-2.59/autoconf-2.59.sh
@@ -10,7 +10,7 @@ src_prepare() {
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
     done
 }
 
diff --git a/sysa/autoconf-2.61/stage1.sh b/sysa/autoconf-2.61/stage1.sh
index c610fef..b164704 100755
--- a/sysa/autoconf-2.61/stage1.sh
+++ b/sysa/autoconf-2.61/stage1.sh
@@ -9,7 +9,7 @@ src_prepare() {
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
     done
 }
 
diff --git a/sysa/autoconf-2.61/stage2.sh b/sysa/autoconf-2.61/stage2.sh
index 071b8c2..fd25d6f 100755
--- a/sysa/autoconf-2.61/stage2.sh
+++ b/sysa/autoconf-2.61/stage2.sh
@@ -8,7 +8,7 @@ src_prepare() {
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
     done
 }
 
diff --git a/sysa/autoconf-2.64/autoconf-2.64.sh b/sysa/autoconf-2.64/autoconf-2.64.sh
index 62ebfdf..b7e6507 100755
--- a/sysa/autoconf-2.64/autoconf-2.64.sh
+++ b/sysa/autoconf-2.64/autoconf-2.64.sh
@@ -8,7 +8,7 @@ src_prepare() {
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
     done
 }
 
diff --git a/sysa/automake-1.4-p6/automake-1.4-p6.sh b/sysa/automake-1.4-p6/automake-1.4-p6.sh
index a2533c2..ef7b9a0 100755
--- a/sysa/automake-1.4-p6/automake-1.4-p6.sh
+++ b/sysa/automake-1.4-p6/automake-1.4-p6.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    rm configure Makefile.in */Makefile.in aclocal.m4 automake.info*
+    rm -- configure Makefile.in */Makefile.in aclocal.m4 automake.info*
     aclocal-1.6
     autoconf-2.52
     # When building with newer automake we get the following error
diff --git a/sysa/automake-1.6.3/stage1.sh b/sysa/automake-1.6.3/stage1.sh
index a99f536..5767fb6 100755
--- a/sysa/automake-1.6.3/stage1.sh
+++ b/sysa/automake-1.6.3/stage1.sh
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
+    rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
     cp aclocal.in aclocal
     cp m4/amversion.in m4/amversion.m4
 }
diff --git a/sysa/automake-1.6.3/stage2.sh b/sysa/automake-1.6.3/stage2.sh
index 2f8411c..b052cd2 100755
--- a/sysa/automake-1.6.3/stage2.sh
+++ b/sysa/automake-1.6.3/stage2.sh
@@ -6,7 +6,7 @@
 src_prepare() {
     sed -i '/Makefile/d' configure.in
 
-    rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
+    rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
     aclocal-1.6
     autoconf-2.52
 }
diff --git a/sysa/automake-1.6.3/stage3.sh b/sysa/automake-1.6.3/stage3.sh
index fe7ab1b..ac41f6c 100755
--- a/sysa/automake-1.6.3/stage3.sh
+++ b/sysa/automake-1.6.3/stage3.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
+    rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
     aclocal-1.6
     autoconf-2.52
     automake-1.6
diff --git a/sysa/automake-1.7.8/automake-1.7.8.sh b/sysa/automake-1.7.8/automake-1.7.8.sh
index 3faa601..ac46cef 100755
--- a/sysa/automake-1.7.8/automake-1.7.8.sh
+++ b/sysa/automake-1.7.8/automake-1.7.8.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
+    rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
 
     autoreconf-2.55
 }
diff --git a/sysa/automake-1.7/stage1.sh b/sysa/automake-1.7/stage1.sh
index 633c5bf..25b8348 100755
--- a/sysa/automake-1.7/stage1.sh
+++ b/sysa/automake-1.7/stage1.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
+    rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
     sed -i -e 's/2.54/2.53/' -e '/AC_PROG_EGREP/d' -e '/AC_PROG_FGREP/d' configure.in
     aclocal-1.6
     autoconf-2.53
diff --git a/sysa/automake-1.7/stage2.sh b/sysa/automake-1.7/stage2.sh
index be6ea8b..66361f3 100755
--- a/sysa/automake-1.7/stage2.sh
+++ b/sysa/automake-1.7/stage2.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
+    rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
 
     autoreconf-2.54
 }
diff --git a/sysa/binutils-2.14/binutils-2.14.sh b/sysa/binutils-2.14/binutils-2.14.sh
index c59c100..684969b 100755
--- a/sysa/binutils-2.14/binutils-2.14.sh
+++ b/sysa/binutils-2.14/binutils-2.14.sh
@@ -72,7 +72,7 @@ src_prepare() {
     done
 
     # Rebuild bison files
-    touch */*.y
+    touch -- */*.y
     rm ld/ldgram.c ld/ldgram.h
     rm gas/itbl-parse.c gas/itbl-parse.h
     rm gas/m68k-parse.c
@@ -83,13 +83,13 @@ src_prepare() {
     rm binutils/rcparse.c binutils/rcparse.h
 
     # Rebuild flex generated files
-    touch */*.l
+    touch -- */*.l
     rm ld/ldlex.c
     rm gas/itbl-lex.c
     rm binutils/syslex.c binutils/rclex.c binutils/deflex.c binutils/arlex.c
 
     # Remove prebuilt texinfo files
-    rm */*.info* */*/*.info*
+    rm -- */*.info* */*/*.info*
 }
 
 src_configure() {
diff --git a/sysa/bzip2-1.0.8/bzip2-1.0.8.sh b/sysa/bzip2-1.0.8/bzip2-1.0.8.sh
index bd0231a..6118e30 100755
--- a/sysa/bzip2-1.0.8/bzip2-1.0.8.sh
+++ b/sysa/bzip2-1.0.8/bzip2-1.0.8.sh
@@ -14,8 +14,8 @@ src_compile() {
 
 src_install() {
     # Manually install bzip2 (cannot replace binary while running)
-    install -D bzip2 ${PREFIX}/bin/bzip2
-    mkdir -p ${DESTDIR}${PREFIX}/bin
-    ln -sf ${PREFIX}/bin/bzip2 ${DESTDIR}${PREFIX}/bin/bunzip2
-    ln -sf ${PREFIX}/bin/bzip2 ${DESTDIR}${PREFIX}/bin/bzcat
+    install -D bzip2 "${PREFIX}/bin/bzip2"
+    mkdir -p "${DESTDIR}${PREFIX}/bin"
+    ln -sf "${PREFIX}/bin/bzip2" "${DESTDIR}${PREFIX}/bin/bunzip2"
+    ln -sf "${PREFIX}/bin/bzip2" "${DESTDIR}${PREFIX}/bin/bzcat"
 }
diff --git a/sysa/flex-2.6.4/flex-2.6.4.sh b/sysa/flex-2.6.4/flex-2.6.4.sh
index df5a653..022b84e 100755
--- a/sysa/flex-2.6.4/flex-2.6.4.sh
+++ b/sysa/flex-2.6.4/flex-2.6.4.sh
@@ -22,6 +22,6 @@ src_install() {
     cd ..
 
     # Remove yacc, we won't need it any longer
-    rm ${PREFIX}/bin/yacc
+    rm "${PREFIX}/bin/yacc"
     rm /yaccpar
 }
diff --git a/sysa/gcc-4.0.4/pass2.sh b/sysa/gcc-4.0.4/pass2.sh
index da4b121..ff3140b 100755
--- a/sysa/gcc-4.0.4/pass2.sh
+++ b/sysa/gcc-4.0.4/pass2.sh
@@ -94,5 +94,5 @@ src_compile() {
 src_install() {
     mkdir -p "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/install-tools/include"
     make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}"
-    cp gcc/gsyslimits.h ${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h
+    cp gcc/gsyslimits.h "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h"
 }
diff --git a/sysa/kbd-1.15/kbd-1.15.sh b/sysa/kbd-1.15/kbd-1.15.sh
index da43772..2024a6b 100755
--- a/sysa/kbd-1.15/kbd-1.15.sh
+++ b/sysa/kbd-1.15/kbd-1.15.sh
@@ -16,7 +16,7 @@ src_prepare() {
 }
 
 src_configure() {
-    ./configure --prefix=${PREFIX}
+    ./configure --prefix="${PREFIX}"
 }
 
 src_compile() {
@@ -26,5 +26,5 @@ src_compile() {
 }
 
 src_install() {
-    make MAKEINFO=true DESTDIR=${DESTDIR} install
+    make MAKEINFO=true DESTDIR="${DESTDIR}" install
 }
diff --git a/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh b/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh
index 1745fa8..cfcad78 100755
--- a/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh
+++ b/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh
@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -9,6 +10,6 @@ src_prepare() {
 }
 
 src_configure() {
-    ./configure --prefix=${PREFIX} \
+    ./configure --prefix="${PREFIX}" \
         --sbindir="${PREFIX}/bin"
 }
diff --git a/sysa/linux-4.9.10/linux-4.9.10.sh b/sysa/linux-4.9.10/linux-4.9.10.sh
index 86ebe78..1faf670 100644
--- a/sysa/linux-4.9.10/linux-4.9.10.sh
+++ b/sysa/linux-4.9.10/linux-4.9.10.sh
@@ -8,7 +8,7 @@ src_unpack() {
     mv "${DISTFILES}/deblob-4.9" "${pkg}/"
     # Remove all previous source tarballs
     mv "${DISTFILES}/${pkg}.tar.gz" .
-    rm -r "${DISTFILES}/"*
+    rm -r "${DISTFILES:?}/"*
     mv "${pkg}.tar.gz" "${DISTFILES}"
     default || true # Predictable link errors - not a problem
     rm -r "${DISTFILES}" # Clear storage space
diff --git a/sysa/linux-headers-5.10.41/linux-headers-5.10.41.sh b/sysa/linux-headers-5.10.41/linux-headers-5.10.41.sh
index 6427d26..afa6dde 100755
--- a/sysa/linux-headers-5.10.41/linux-headers-5.10.41.sh
+++ b/sysa/linux-headers-5.10.41/linux-headers-5.10.41.sh
@@ -56,7 +56,7 @@ src_install() {
     VERSION=5
     PATCHLEVEL=10
     SUBLEVEL=42
-    VERSION_CODE="$((${VERSION} * 65536 + ${PATCHLEVEL} * 256 + ${SUBLEVEL}))"
+    VERSION_CODE="$((VERSION * 65536 + PATCHLEVEL * 256 + SUBLEVEL))"
     echo '#define LINUX_VERSION_CODE '"${VERSION_CODE}" \
         > "${DESTDIR}${PREFIX}/include/linux/version.h"
     echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + ((c) > 255 ? 255 : (c)))' \
diff --git a/sysa/musl-1.2.2/musl-1.2.2.sh b/sysa/musl-1.2.2/musl-1.2.2.sh
index febe61c..cd73d2a 100755
--- a/sysa/musl-1.2.2/musl-1.2.2.sh
+++ b/sysa/musl-1.2.2/musl-1.2.2.sh
@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-SRCS="musl-1.2.2.tar.gz"
-
 src_configure() {
     CC=gcc ./configure \
         --host=i386-unknown-linux-musl \
diff --git a/sysa/tcc-0.9.27/tcc-musl-pass1.sh b/sysa/tcc-0.9.27/tcc-musl-pass1.sh
index 8c2859f..d03acd1 100755
--- a/sysa/tcc-0.9.27/tcc-musl-pass1.sh
+++ b/sysa/tcc-0.9.27/tcc-musl-pass1.sh
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2021-2022 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -14,7 +14,7 @@ src_compile() {
     export incdir=${PREFIX}/include/musl
     export bindir=${PREFIX}/bin
 
-    mkdir -p ${libdir}/tcc
+    mkdir -p "${libdir}/tcc"
 
     # We first have to recompile using tcc-0.9.26 as tcc-0.9.27 is not self-hosting,
     # but when linked with musl it is.
@@ -24,12 +24,12 @@ src_compile() {
             -static \
             -o tcc-musl \
             -D TCC_TARGET_I386=1 \
-            -D CONFIG_TCCDIR=\"${libdir}/tcc\" \
-            -D CONFIG_TCC_CRTPREFIX=\"${libdir}\" \
+            -D CONFIG_TCCDIR=\""${libdir}/tcc"\" \
+            -D CONFIG_TCC_CRTPREFIX=\""${libdir}"\" \
             -D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \
-            -D CONFIG_TCC_LIBPATHS=\"${libdir}:${libdir}/tcc\" \
-            -D CONFIG_TCC_SYSINCLUDEPATHS=\"${incdir}\" \
-            -D TCC_LIBGCC=\"${libdir}/libc.a\" \
+            -D CONFIG_TCC_LIBPATHS=\""${libdir}:${libdir}/tcc"\" \
+            -D CONFIG_TCC_SYSINCLUDEPATHS=\""${incdir}"\" \
+            -D TCC_LIBGCC=\""${libdir}/libc.a"\" \
             -D CONFIG_TCC_STATIC=1 \
             -D CONFIG_USE_LIBGCC=1 \
             -D TCC_VERSION=\"0.9.27\" \
@@ -38,14 +38,14 @@ src_compile() {
 
         # libtcc1.a
         ${TCC} -c -D HAVE_CONFIG_H=1 lib/libtcc1.c
-        ${TCC} -ar cr ${libdir}/tcc/libtcc1.a libtcc1.o
+        ${TCC} -ar cr "${libdir}/tcc/libtcc1.a" libtcc1.o
     done
 }
 
 src_install() {
     # Remove old tcc binaries
-    rm ${bindir}/tcc
-    rm ${bindir}/boot*-tcc ${bindir}/tcc-0.9.26 ${bindir}/mes-tcc
-    install -D tcc-musl ${DESTDIR}${bindir}/tcc-musl
-    ln -s tcc-musl ${DESTDIR}${bindir}/tcc
+    rm "${bindir}/tcc"
+    rm "${bindir}"/boot*-tcc "${bindir}/tcc-0.9.26" "${bindir}/mes-tcc"
+    install -D tcc-musl "${DESTDIR}${bindir}/tcc-musl"
+    ln -s tcc-musl "${DESTDIR}${bindir}/tcc"
 }
diff --git a/sysa/tcc-0.9.27/tcc-musl-pass2.sh b/sysa/tcc-0.9.27/tcc-musl-pass2.sh
index 61cd947..f2e5fa1 100755
--- a/sysa/tcc-0.9.27/tcc-musl-pass2.sh
+++ b/sysa/tcc-0.9.27/tcc-musl-pass2.sh
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2021-2022 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -14,19 +14,19 @@ src_compile() {
     export incdir=${PREFIX}/include/musl
     export bindir=${PREFIX}/bin
 
-    mkdir -p ${libdir}/tcc
+    mkdir -p "${libdir}/tcc"
 
     tcc-musl \
         -v \
         -static \
         -o tcc-musl \
         -D TCC_TARGET_I386=1 \
-        -D CONFIG_TCCDIR=\"${libdir}/tcc\" \
-        -D CONFIG_TCC_CRTPREFIX=\"${libdir}\" \
+        -D CONFIG_TCCDIR=\""${libdir}/tcc"\" \
+        -D CONFIG_TCC_CRTPREFIX=\""${libdir}"\" \
         -D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \
-        -D CONFIG_TCC_LIBPATHS=\"${libdir}:${libdir}/tcc\" \
-        -D CONFIG_TCC_SYSINCLUDEPATHS=\"${incdir}\" \
-        -D TCC_LIBGCC=\"${libdir}/libc.a\" \
+        -D CONFIG_TCC_LIBPATHS=\""${libdir}:${libdir}/tcc"\" \
+        -D CONFIG_TCC_SYSINCLUDEPATHS=\""${incdir}"\" \
+        -D TCC_LIBGCC=\""${libdir}/libc.a"\" \
         -D CONFIG_TCC_STATIC=1 \
         -D CONFIG_USE_LIBGCC=1 \
         -D TCC_VERSION=\"0.9.27\" \
@@ -39,6 +39,6 @@ src_compile() {
 }
 
 src_install() {
-    install -D tcc-musl ${DESTDIR}${bindir}/tcc-musl
-    install -D -m 644 libtcc1.a ${DESTDIR}${libdir}/libtcc1.a
+    install -D tcc-musl "${DESTDIR}${bindir}/tcc-musl"
+    install -D -m 644 libtcc1.a "${DESTDIR}${libdir}/libtcc1.a"
 }
diff --git a/sysa/tcc-0.9.27/tcc-musl-pass3.sh b/sysa/tcc-0.9.27/tcc-musl-pass3.sh
index 2f6cbb0..7301f3b 100755
--- a/sysa/tcc-0.9.27/tcc-musl-pass3.sh
+++ b/sysa/tcc-0.9.27/tcc-musl-pass3.sh
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2021-2022 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -14,24 +14,24 @@ src_compile() {
     export incdir=${PREFIX}/include
     export bindir=${PREFIX}/bin
 
-    mkdir -p ${libdir}/tcc
+    mkdir -p "${libdir}/tcc"
 
     tcc-musl \
         -v \
         -static \
         -o tcc-musl \
         -D TCC_TARGET_I386=1 \
-        -D CONFIG_TCCDIR=\"${libdir}/tcc\" \
-        -D CONFIG_TCC_CRTPREFIX=\"${libdir}\" \
+        -D CONFIG_TCCDIR=\""${libdir}/tcc"\" \
+        -D CONFIG_TCC_CRTPREFIX=\""${libdir}"\" \
         -D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \
-        -D CONFIG_TCC_LIBPATHS=\"${libdir}:${libdir}/tcc\" \
-        -D CONFIG_TCC_SYSINCLUDEPATHS=\"${incdir}\" \
-        -D TCC_LIBGCC=\"${libdir}/libc.a\" \
+        -D CONFIG_TCC_LIBPATHS=\""${libdir}:${libdir}/tcc"\" \
+        -D CONFIG_TCC_SYSINCLUDEPATHS=\""${incdir}"\" \
+        -D TCC_LIBGCC=\""${libdir}/libc.a"\" \
         -D CONFIG_TCC_STATIC=1 \
         -D CONFIG_USE_LIBGCC=1 \
         -D TCC_VERSION=\"0.9.27\" \
         -D ONE_SOURCE=1 \
-        -I ${incdir} \
+        -I "${incdir}" \
         tcc.c
 
     # libtcc1.a
@@ -40,6 +40,6 @@ src_compile() {
 }
 
 src_install() {
-    install -D tcc-musl ${DESTDIR}${bindir}/tcc-musl
-    install -D -m 644 libtcc1.a ${DESTDIR}${libdir}/libtcc1.a
+    install -D tcc-musl "${DESTDIR}${bindir}/tcc-musl"
+    install -D -m 644 libtcc1.a "${DESTDIR}${libdir}/libtcc1.a"
 }
diff --git a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
index 71990bc..665a2a0 100755
--- a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
+++ b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
@@ -10,7 +10,7 @@ src_prepare() {
 }
 
 src_configure() {
-    ./configure --prefix=${PREFIX} \
+    ./configure --prefix="${PREFIX}" \
         --bindir="${PREFIX}/bin" \
         --sbindir="${PREFIX}/bin" \
         --libdir="${PREFIX}/lib/musl" \
diff --git a/sysc/autoconf-2.69/autoconf-2.69.sh b/sysc/autoconf-2.69/autoconf-2.69.sh
index d2801af..18ced3d 100755
--- a/sysc/autoconf-2.69/autoconf-2.69.sh
+++ b/sysc/autoconf-2.69/autoconf-2.69.sh
@@ -9,7 +9,7 @@ src_prepare() {
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
     done
 }
 
diff --git a/sysc/autoconf-2.71/autoconf-2.71.sh b/sysc/autoconf-2.71/autoconf-2.71.sh
index 1a87113..f43ac73 100755
--- a/sysc/autoconf-2.71/autoconf-2.71.sh
+++ b/sysc/autoconf-2.71/autoconf-2.71.sh
@@ -7,9 +7,7 @@ src_prepare() {
     autoreconf-2.69 -fi
 
     # Install autoconf data files into versioned directory
-    for file in Makefile.in; do
-        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
-    done
+    sed -i '/^pkgdatadir/s:$:-@VERSION@:' Makefile.in
 }
 
 src_configure() {
diff --git a/sysc/coreutils-8.32/coreutils-8.32.sh b/sysc/coreutils-8.32/coreutils-8.32.sh
index c1db3c5..8565a54 100755
--- a/sysc/coreutils-8.32/coreutils-8.32.sh
+++ b/sysc/coreutils-8.32/coreutils-8.32.sh
@@ -18,8 +18,8 @@ regenerate_files() {
     # dependency.
     cp man/dummy-man man/help2man
 
-    VERSION=$(basename ${BASH_SOURCE[0]} .sh | sed 's/coreutils-//')
-    echo $VERSION > .tarball-version
+    VERSION=$(basename "${BASH_SOURCE[0]}" .sh | sed 's/coreutils-//')
+    echo "$VERSION" > .tarball-version
 
     # We don't have autopoint from gettext yet.
     AUTOPOINT=true autoreconf-2.69 -fi
diff --git a/sysc/gcc-4.7.4/gcc-4.7.4.sh b/sysc/gcc-4.7.4/gcc-4.7.4.sh
index 3a9adb5..3df6603 100755
--- a/sysc/gcc-4.7.4/gcc-4.7.4.sh
+++ b/sysc/gcc-4.7.4/gcc-4.7.4.sh
@@ -42,20 +42,20 @@ src_prepare() {
     # Regenerate configure scripts
     # Find all folders with configure script and rebuild them. At the moment we exclude boehm-gc folder due to
     # an error but we don't use that directory anyway (it's only needed for Objective C)
-    for dir in $(ls */configure | sed 's#/configure##' | tr "\n" " " | sed -e 's/ $/\n/' -e 's/^boehm-gc //'); do
-        cd $dir
+    for dir in $(find . -mindepth 2 -maxdepth 2 -name configure.ac | sed 's#/configure.ac##' | tr "\n" " " | sed -e 's/ $/\n/' -e 's/^boehm-gc //'); do
+        pushd "$dir"
         rm configure
         autoconf-2.64 || autoconf-2.64
-        cd ..
+        popd
     done
 
     # Regenerate Makefile.in
     # Find all folders with Makefile.am and rebuild them. At the moment we exclude boehm-gc folder.
-    for dir in $(ls */Makefile.am | sed 's#/Makefile.am##' | tr "\n" " " | sed -e 's/ $/\n/' -e 's/^boehm-gc //'); do
-        cd $dir
+    for dir in $(find . -mindepth 2 -maxdepth 2 -name Makefile.am | sed 's#/Makefile.am##' | tr "\n" " " | sed -e 's/ $/\n/' -e 's/^boehm-gc //'); do
+        pushd "$dir"
         rm Makefile.in
         AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 automake-1.11
-        cd ..
+        popd
     done
 
     for dir in libdecnumber libcpp libiberty gcc; do
@@ -68,7 +68,7 @@ src_prepare() {
     # Rebuild libtool files
     rm config.guess config.sub ltmain.sh
     libtoolize
-    cp "${PREFIX}/"/share/automake-1.15/config.sub .
+    cp "${PREFIX}/share/automake-1.15/config.sub" .
 
     # Workaround for bison being too new
     rm intl/plural.c
@@ -126,7 +126,7 @@ src_compile() {
     pushd order-a
     ar x ../.libs/libstdc++.a
     rm ../.libs/libstdc++.a
-    ar cru ../.libs/libstdc++.a *.o
+    ar cru ../.libs/libstdc++.a ./*.o
     popd
     popd
 }
@@ -135,7 +135,7 @@ src_install() {
     make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}" MAKEINFO=true
     make -C build/libgcc install DESTDIR="${DESTDIR}" host_subdir=build
     make -C build/libstdc++-v3 install DESTDIR="${DESTDIR}"
-    cp gcc/gsyslimits.h ${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/syslimits.h
+    cp gcc/gsyslimits.h "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/syslimits.h"
     # Very strange mis-versoning error
     mkdir -p "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/"
     mv "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/"* "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/"
diff --git a/sysc/guile-3.0.7/guile-3.0.7.sh b/sysc/guile-3.0.7/guile-3.0.7.sh
index 407329e..42f4243 100755
--- a/sysc/guile-3.0.7/guile-3.0.7.sh
+++ b/sysc/guile-3.0.7/guile-3.0.7.sh
@@ -67,7 +67,7 @@ src_compile() {
     pushd libguile/.libs/order
     ar x ../libguile-3.0.a
     rm ../libguile-3.0.a
-    ar cr ../libguile-3.0.a *.o
+    ar cr ../libguile-3.0.a ./*.o
     popd
 
     # Recompile guile with fixed libguile