diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild
index e4732875c8..4417c15a76 100644
--- a/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild
+++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild
@@ -17,7 +17,7 @@ mycommit="60ff105ba76746ac8f669616ed3658f7c03c3ab3"
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
-elif [[ ! -z "$mycommit" ]]; then
+elif [[ ! -z "${mycommit}" ]]; then
 	SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"
 	S="${WORKDIR}/hin9-${mycommit}"
 else
@@ -55,13 +55,13 @@ FILECAPS=(
 )
 
 pkg_setup() {
-	linux-info_pkg_setup;
+	linux-info_pkg_setup
 	lua-single_pkg_setup
 }
 
 src_configure() {
 	version=$(ver_cut 1-2 $(lua_get_version))
-	if [ "$version" == "2.1" ]; then
+	if [[ "${version}" == "2.1" ]]; then
 		version="jit"
 	fi
 	local emesonargs=(
@@ -70,7 +70,7 @@ src_configure() {
 		$(meson_use fcgi)
 		$(meson_use rproxy)
 		$(meson_use ffcall)
-		-Dforce-lua-version=$version
+		-Dforce-lua-version=${version}
 	)
 	meson_src_configure
 }
@@ -78,19 +78,19 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	newinitd "${S}/external/packaging/$PN.initd.sh" $PN
-	newconfd "${S}/external/packaging/$PN.confd.sh" $PN
-	systemd_dounit "${FILESDIR}/$PN.service" # not tested
+	newinitd "${S}/external/packaging/${PN}.initd.sh" ${PN}
+	newconfd "${S}/external/packaging/${PN}.confd.sh" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service" # not tested
 
 	# config
-	insinto /etc/$PN
+	insinto /etc/${PN}
 	doins "${S}/workdir/main.lua"
 	doins "${S}/workdir/lib.lua"
 	doins -r "${S}/workdir/config/"
 
 	# logrotate
 	insinto /etc/logrotate.d
-	newins "${S}/external/packaging/$PN.logrotate.sh" $PN
+	newins "${S}/external/packaging/${PN}.logrotate.sh" ${PN}
 }
 
 pkg_postinst() {
diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild
index 60ce5a5ee9..2f6e9c8e98 100644
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-9999.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
-elif [[ ! -z "$mycommit" ]]; then
+elif [[ ! -z "${mycommit}" ]]; then
 	SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"
 	S="${WORKDIR}/hin9-${mycommit}"
 else
@@ -53,13 +53,13 @@ FILECAPS=(
 )
 
 pkg_setup() {
-	linux-info_pkg_setup;
+	linux-info_pkg_setup
 	lua-single_pkg_setup
 }
 
 src_configure() {
 	version=$(ver_cut 1-2 $(lua_get_version))
-	if [ "$version" == "2.1" ]; then
+	if [[ "${version}" == "2.1" ]]; then
 		version="jit"
 	fi
 	local emesonargs=(
@@ -68,7 +68,7 @@ src_configure() {
 		$(meson_use fcgi)
 		$(meson_use rproxy)
 		$(meson_use ffcall)
-		-Dforce-lua-version=$version
+		-Dforce-lua-version=${version}
 	)
 	meson_src_configure
 }
@@ -76,19 +76,19 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	newinitd "${S}/external/packaging/$PN.initd.sh" $PN
-	newconfd "${S}/external/packaging/$PN.confd.sh" $PN
-	systemd_dounit "${FILESDIR}/$PN.service" # not tested
+	newinitd "${S}/external/packaging/${PN}.initd.sh" ${PN}
+	newconfd "${S}/external/packaging/${PN}.confd.sh" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service" # not tested
 
 	# config
-	insinto /etc/$PN
+	insinto /etc/${PN}
 	doins "${S}/workdir/main.lua"
 	doins "${S}/workdir/lib.lua"
 	doins -r "${S}/workdir/config/"
 
 	# logrotate
 	insinto /etc/logrotate.d
-	newins "${S}/external/packaging/$PN.logrotate.sh" $PN
+	newins "${S}/external/packaging/${PN}.logrotate.sh" ${PN}
 }
 
 pkg_postinst() {