1 files changed, 19 insertions, 15 deletions

diff --git a/platform/rpm/mkrpm.sh b/platform/rpm/mkrpm.sh
index d32ccd360..0572480c6 100755
--- a/platform/rpm/mkrpm.sh
+++ b/platform/rpm/mkrpm.sh
@@ -3,23 +3,26 @@
 # Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
-# Usage: ./platform/rpm/mkrpm.sh firejail <version> "<config options>"
+# Usage: ./platform/rpm/mkrpm.sh <config options>
 #
 # Builds rpms in a temporary directory then places the result in the
 # current working directory.
 
-name=$1
+# shellcheck source=config.sh
+. "$(dirname "$0")/../../config.sh" || exit 1
+
+name="$TARNAME"
 # Strip any trailing prefix from the version like -rc1 etc
-version=$(echo "$2" | sed 's/\-.*//g')
-config_opt=$3
+version="$(printf '%s\n' "$VERSION" | sed 's/\-.*//g')"
+config_opt="$*"
 
-if [[ ! -f platform/rpm/${name}.spec ]]; then
-    echo error: spec file not found for name \"${name}\"
+if [[ ! -f "platform/rpm/${name}.spec" ]]; then
+    printf 'error: spec file not found for name %s\n' "${name}" >&2
     exit 1
 fi
 
 if [[ -z "${version}" ]]; then
-    echo error: version must be given
+    printf 'error: version must be given\n' >&2
     exit 1
 fi
 
@@ -28,26 +31,27 @@ if [[ -z "${config_opt}" ]]; then
 fi
 
 # Make a temporary directory and arrange to clean up on exit
-tmpdir=$(mktemp -d)
-mkdir -p ${tmpdir}/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
+tmpdir="$(mktemp -d)"
+mkdir -p "${tmpdir}"/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 function cleanup {
-    rm -rf ${tmpdir}
+    rm -rf "${tmpdir}"
 }
 trap cleanup EXIT
 
 # Create the spec file
-tmp_spec_file=${tmpdir}/SPECS/${name}.spec
+tmp_spec_file="${tmpdir}/SPECS/${name}.spec"
 sed -e "s/__NAME__/${name}/g" \
     -e "s/__VERSION__/${version}/g" \
     -e "s/__CONFIG_OPT__/${config_opt}/g" \
-    platform/rpm/${name}.spec >${tmp_spec_file}
+    "platform/rpm/${name}.spec" >"${tmp_spec_file}"
 # FIXME: We could parse RELNOTES and create a %changelog section here
 
 # Copy the source to build into a tarball
-tar --exclude='./.git*' --transform "s/^./${name}-${version}/" -czf ${tmpdir}/SOURCES/${name}-${version}.tar.gz .
+tar --exclude='./.git*' --transform "s/^./${name}-${version}/" \
+    -czf "${tmpdir}/SOURCES/${name}-${version}.tar.gz" .
 
 # Build the files (rpm, debug rpm and source rpm)
-rpmbuild --quiet --define "_topdir ${tmpdir}" -ba ${tmp_spec_file}
+rpmbuild --quiet --define "_topdir ${tmpdir}" -ba "${tmp_spec_file}"
 
 # Copy the results to cwd
-mv ${tmpdir}/SRPMS/*.rpm ${tmpdir}/RPMS/*/*rpm .
+mv "${tmpdir}/SRPMS"/*.rpm "${tmpdir}/RPMS"/*/*rpm .