diff --git a/brp-fix-pyc-reproducibility b/brp-fix-pyc-reproducibility
index 16613b0..05857b3 100644
--- a/brp-fix-pyc-reproducibility
+++ b/brp-fix-pyc-reproducibility
@@ -1,7 +1,7 @@
 #!/bin/bash -eu
 
 # If using normal root, avoid changing anything.
-if [ -z "${RPM_BUILD_ROOT:-}" ] || [ "${RPM_BUILD_ROOT:-}" = "/" ]; then
+if [[ -z "${RPM_BUILD_ROOT:-}" ]] || [[ "${RPM_BUILD_ROOT:-}" = "/" ]]; then
   exit 0
 fi
 
@@ -10,7 +10,7 @@ fi
 path_to_fix=${1:?}
 
 # First, check that the parser is available:
-if [ ! -x /usr/bin/marshalparser ]; then
+if [[ ! -x /usr/bin/marshalparser ]]; then
   echo "ERROR: If %py_reproducible_pyc_path is defined, you have to also BuildRequire: /usr/bin/marshalparser !"
   exit 1
 fi
diff --git a/brp-python-bytecompile b/brp-python-bytecompile
index b1e5db5..fd7172f 100644
--- a/brp-python-bytecompile
+++ b/brp-python-bytecompile
@@ -6,7 +6,7 @@ errors_terminate=$2
 # Therefore $1 ($default_python) is not needed and is invoked with "" by default.
 # $default_python stays in the arguments for backward compatibility and $extra for the following check:
 extra=$3
-if [ 0$extra -eq 1 ]; then
+if [[ 0"$extra" -eq 1 ]]; then
     echo -e "%_python_bytecompile_extra is discontinued, use %py_byte_compile instead.\nSee: https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_3" >/dev/stderr
     exit 1
 fi
@@ -14,7 +14,7 @@ fi
 compileall_flags="$4"
 
 # If using normal root, avoid changing anything.
-if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then
+if [[ -z "$RPM_BUILD_ROOT" ]] || [[ "$RPM_BUILD_ROOT" = "/" ]]; then
 	exit 0
 fi
 
@@ -45,14 +45,14 @@ function python_bytecompile()
     #
     # Python 3.4 and higher
     #
-    if [ "$python_version" -ge 34 ]; then
+    if [[ "$python_version" -ge 34 ]]; then
 
         # We compile all opt levels in one go: only when $options is empty.
-        if [ -n "$options" ]; then
+        if [[ -n "$options" ]]; then
             return
         fi
 
-        if [ "$python_version" -ge 39 ]; then
+        if [[ "$python_version" -ge 39 ]]; then
             # For Pyhon 3.9+, use the standard library
             compileall_module=compileall
         else
@@ -60,7 +60,7 @@ function python_bytecompile()
             compileall_module=compileall2
         fi
 
-        if [ "$python_version" -ge 37 ]; then
+        if [[ "$python_version" -ge 37 ]]; then
             # Force the TIMESTAMP invalidation mode
             invalidation_option=--invalidation-mode=timestamp
         else
@@ -69,7 +69,7 @@ function python_bytecompile()
             invalidation_option=
         fi
 
-        [ ! -z $exclude ] && exclude="-x '$exclude'"
+        [[ -n "$exclude" ]] && exclude="-x '$exclude'"
 
         # PYTHONPATH is needed for compileall2, but doesn't hurt for the stdlib
         # -o 0 -o 1 are the optimization levels
@@ -137,12 +137,12 @@ do
 
 	# Generate normal (.pyc) byte-compiled files.
 	python_clamp_source_mtime "" "$python_binary" "" "$python_libdir" ""
-	if [ $? -ne 0 ] && [ 0$errors_terminate -ne 0 ]; then
+	if [[ $? -ne 0 ]] && [[ 0"$errors_terminate" -ne 0 ]]; then
 		# One or more of the files had inaccessible mtime
 		exit 1
 	fi
 	python_bytecompile "" "$python_binary" "" "$python_libdir" "$compileall_flags"
-	if [ $? -ne 0 ] && [ 0$errors_terminate -ne 0 ]; then
+	if [[ $? -ne 0 ]] && [[ 0"$errors_terminate" -ne 0 ]]; then
 		# One or more of the files had a syntax error
 		exit 1
 	fi
@@ -150,7 +150,7 @@ do
 	# Generate optimized (.pyo) byte-compiled files.
 	# N.B. For Python 3.4+, this call does nothing
 	python_bytecompile "-O" "$python_binary" "" "$python_libdir" "$compileall_flags"
-	if [ $? -ne 0 ] && [ 0$errors_terminate -ne 0 ]; then
+	if [[ $? -ne 0 ]] && [[ 0"$errors_terminate" -ne 0 ]]; then
 		# One or more of the files had a syntax error
 		exit 1
 	fi
diff --git a/brp-python-rpm-in-distinfo b/brp-python-rpm-in-distinfo
index 473af00..b72d704 100755
--- a/brp-python-rpm-in-distinfo
+++ b/brp-python-rpm-in-distinfo
@@ -1,15 +1,15 @@
-#!/bin/sh
+#!/usr/bin/bash
 
 set -eu
 # If using normal root, avoid changing anything.
-if [ "${RPM_BUILD_ROOT:-/}" = "/" ] ; then
+if [[ "${RPM_BUILD_ROOT:-/}" = "/" ]] ; then
 	exit 0
 fi
 
 find "$RPM_BUILD_ROOT" -name 'INSTALLER' -type f -print0|grep -z -E "/usr/lib(64)?/python3\.[0-9]+/site-packages/[^/]+\.dist-info/INSTALLER" | while read -d "" installer ; do
 	if cmp -s <(echo pip) "$installer" ; then
 		echo "rpm" > "$installer"
-		rm -f $(dirname "$installer")/RECORD
+		rm -f "$(dirname "$installer")/RECORD"
 	fi
 done
 exit 0