diff --git a/etc/portage/repo.postsync.d/sync_gentoo_cache b/etc/portage/repo.postsync.d/sync_gentoo_cache
index 5163956..e52d8bf 100755
--- a/etc/portage/repo.postsync.d/sync_gentoo_cache
+++ b/etc/portage/repo.postsync.d/sync_gentoo_cache
@@ -3,13 +3,13 @@
 source /etc/init.d/functions.sh
 source /etc/portage/util-functions.sh
 
-repository_name=${1}
-repository_path=${3}
+repository_name="${1}"
+repository_path="${3}"
 
 # Number of jobs for egencache, default is number or processors.
 parallel_jobs="$(nproc)"
 
-if [ "${repository_name}" == "gentoo" ]; then
+if [[ ${repository_name} == "gentoo" ]]; then
 	ebegin "Fetching pre-generated metadata cache for ${repository_name}"
 	rsync -aq rsync://rsync.gentoo.org/gentoo-portage/metadata/md5-cache/ "${repository_path}"/metadata/md5-cache/
 	eend $?
diff --git a/etc/portage/repo.postsync.d/sync_gentoo_dtd b/etc/portage/repo.postsync.d/sync_gentoo_dtd
index b3f4b46..431003e 100755
--- a/etc/portage/repo.postsync.d/sync_gentoo_dtd
+++ b/etc/portage/repo.postsync.d/sync_gentoo_dtd
@@ -3,10 +3,10 @@
 source /etc/init.d/functions.sh
 source /etc/portage/util-functions.sh
 
-repository_name=${1}
-repository_path=${3}
+repository_name="${1}"
+repository_path="${3}"
 
-if [ "${repository_name}" == "gentoo" ]; then
+if [[ ${repository_name} == "gentoo" ]]; then
 	DTDDIR="${repository_path}"/metadata/dtd
 	ebegin "Updating DTDs"
 	if [[ -e ${DTDDIR} ]]; then
diff --git a/etc/portage/repo.postsync.d/sync_gentoo_glsa b/etc/portage/repo.postsync.d/sync_gentoo_glsa
index 2d1cfc9..f0e93c7 100755
--- a/etc/portage/repo.postsync.d/sync_gentoo_glsa
+++ b/etc/portage/repo.postsync.d/sync_gentoo_glsa
@@ -3,10 +3,10 @@
 source /etc/init.d/functions.sh
 source /etc/portage/util-functions.sh
 
-repository_name=${1}
-repository_path=${3}
+repository_name="${1}"
+repository_path="${3}"
 
-if [ "${repository_name}" == "gentoo" ]; then
+if [[ ${repository_name} == "gentoo" ]]; then
 	GLSADIR="${repository_path}"/metadata/glsa
 	ebegin "Updating GLSAs"
 	if [[ -e ${GLSADIR} ]]; then
diff --git a/etc/portage/repo.postsync.d/sync_gentoo_herds_xml b/etc/portage/repo.postsync.d/sync_gentoo_herds_xml
index 06a3fc8..2d84e14 100755
--- a/etc/portage/repo.postsync.d/sync_gentoo_herds_xml
+++ b/etc/portage/repo.postsync.d/sync_gentoo_herds_xml
@@ -3,10 +3,10 @@
 source /etc/init.d/functions.sh
 source /etc/portage/util-functions.sh
 
-repository_name=${1}
-repository_path=${3}
+repository_name="${1}"
+repository_path="${3}"
 
-if [ "${repository_name}" == "gentoo" ]; then
+if [[ ${repository_name} == "gentoo" ]]; then
 	ebegin "Updating herds.xml"
 	wget -q -O "${repository_path}"/metadata/herds.xml https://api.gentoo.org/packages/herds.xml
 	eend $?
diff --git a/etc/portage/repo.postsync.d/sync_gentoo_news b/etc/portage/repo.postsync.d/sync_gentoo_news
index a3eef5d..5dfb2e3 100755
--- a/etc/portage/repo.postsync.d/sync_gentoo_news
+++ b/etc/portage/repo.postsync.d/sync_gentoo_news
@@ -3,10 +3,10 @@
 source /etc/init.d/functions.sh
 source /etc/portage/util-functions.sh
 
-repository_name=${1}
-repository_path=${3}
+repository_name="${1}"
+repository_path="${3}"
 
-if [ "${repository_name}" == "gentoo" ]; then
+if [[ ${repository_name} == "gentoo" ]]; then
 	NEWSDIR="${repository_path}"/metadata/news
 	ebegin "Updating news items"
 	if [[ -e ${NEWSDIR} ]]; then