[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -15,7 +15,7 @@ repos:
       - id: check-executables-have-shebangs
       - id: requirements-txt-fixer
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.9.0.6
+    rev: v0.10.0.1
     hooks:
       - id: shellcheck
   - repo: https://github.com/maxwinterstein/shfmt-py

import.sh

@@ -3,23 +3,23 @@
 set -e
 
 if [[ -z "${IMPORT_FROM_REPO}" ]]; then
-    echo "::notice title=Skipping::Skipping import"
-    exit 0
+	echo "::notice title=Skipping::Skipping import"
+	exit 0
 fi
 
 {
-    echo "set base_path ${APT_MIRROR_BASE_PATH:-/tmp/apt-mirror}"
-    echo "set run_postmirror 0"
-    echo -e "${IMPORT_FROM_REPO}"
+	echo "set base_path ${APT_MIRROR_BASE_PATH:-/tmp/apt-mirror}"
+	echo "set run_postmirror 0"
+	echo -e "${IMPORT_FROM_REPO}"
 } >/tmp/mirror.list
 apt-mirror /tmp/mirror.list |& tee /tmp/mirror.log
 if grep -q -i failed /tmp/mirror.log; then
-    cat /tmp/mirror.log
-    exit 1
+	cat /tmp/mirror.log
+	exit 1
 fi
 mapfile -t packages < <(find /tmp/apt-mirror/mirror -type f -name '*.deb')
 # shellcheck disable=SC2128
 if [ -n "${packages}" ]; then
-    # shellcheck disable=SC2048,SC2086
-    cp -v ${packages[*]} .
+	# shellcheck disable=SC2048,SC2086
+	cp -v ${packages[*]} .
 fi

repo.sh

@@ -31,11 +31,11 @@ mapfile -t fingerprints < <(grep -o "key [0-9A-Z]*:" /tmp/gpg.log | sort -u | gr
 keyring_version=0
 keyring_files=()
 for fingerprint in "${fingerprints[@]}"; do
-    IFS=':' read -r -a pub < <(gpg --list-keys --with-colons "${fingerprint}" | grep pub --color=never)
-    creation_date="${pub[5]}"
-    keyring_version=$(("${keyring_version}" + "${creation_date}"))
-    gpg --export "${fingerprint}" >"${keyring_name}-${creation_date}.gpg"
-    keyring_files+=("${keyring_name}-${creation_date}.gpg")
+	IFS=':' read -r -a pub < <(gpg --list-keys --with-colons "${fingerprint}" | grep pub --color=never)
+	creation_date="${pub[5]}"
+	keyring_version=$(("${keyring_version}" + "${creation_date}"))
+	gpg --export "${fingerprint}" >"${keyring_name}-${creation_date}.gpg"
+	keyring_files+=("${keyring_name}-${creation_date}.gpg")
 done
 
 cat >"${tmpdir}/keyring-nfpm.yaml" <<EOF
@@ -50,7 +50,7 @@ contents:
 EOF
 
 for keyring_file in "${keyring_files[@]}"; do
-    cat >>"${tmpdir}/keyring-nfpm.yaml" <<EOF
+	cat >>"${tmpdir}/keyring-nfpm.yaml" <<EOF
   - src: ${keyring_file}
     dst: /etc/apt/trusted.gpg.d/
 EOF
@@ -59,28 +59,28 @@ done
 /tmp/nfpm package --config "${tmpdir}/keyring-nfpm.yaml" --packager deb
 
 if [ -d "${scan_dir}/.repo" ]; then
-    cp -rv "${scan_dir}/.repo" "${tmpdir}"/
+	cp -rv "${scan_dir}/.repo" "${tmpdir}"/
 else
-    # add repo config template if none exists
-    mkdir -p "${tmpdir}/.repo/${repo_name}/conf"
-    (
-        echo "Origin: ${origin}"
-        echo "Suite: ${suite}"
-        echo "Label: ${label}"
-        echo "Codename: ${codename}"
-        echo "Components: ${components}"
-        echo "Architectures: ${architectures}"
-        echo "SignWith: ${fingerprints[*]}"
-        echo "Limit: ${limit}"
-    ) >>"${tmpdir}/.repo/${repo_name}/conf/distributions"
-    if [[ -n "${override}" ]]; then
-        echo "DebOverride: ${override##*/}" >>"${tmpdir}/.repo/${repo_name}/conf/distributions"
-        cp -v "${override}" "${tmpdir}/.repo/${repo_name}/conf/${override##*/}"
-    fi
+	# add repo config template if none exists
+	mkdir -p "${tmpdir}/.repo/${repo_name}/conf"
+	(
+		echo "Origin: ${origin}"
+		echo "Suite: ${suite}"
+		echo "Label: ${label}"
+		echo "Codename: ${codename}"
+		echo "Components: ${components}"
+		echo "Architectures: ${architectures}"
+		echo "SignWith: ${fingerprints[*]}"
+		echo "Limit: ${limit}"
+	) >>"${tmpdir}/.repo/${repo_name}/conf/distributions"
+	if [[ -n "${override}" ]]; then
+		echo "DebOverride: ${override##*/}" >>"${tmpdir}/.repo/${repo_name}/conf/distributions"
+		cp -v "${override}" "${tmpdir}/.repo/${repo_name}/conf/${override##*/}"
+	fi
 fi
 
 if ! grep -q "^Components:.*${components}" "${tmpdir}/.repo/${repo_name}/conf/distributions"; then
-    sed -i "s,^Components: \(.*\),Components: \1 ${components}, " "${tmpdir}/.repo/${repo_name}/conf/distributions"
+	sed -i "s,^Components: \(.*\),Components: \1 ${components}, " "${tmpdir}/.repo/${repo_name}/conf/distributions"
 fi
 
 # export key, configure reprepro (sign w/ multiple keys)
@@ -94,57 +94,57 @@ mapfile -t packages < <(find "${scan_dir}" -type f -name "*.deb")
 includedebs=()
 
 for package in "${packages[@]}"; do
-    package_name="$(dpkg -f "${package}" Package)"
-    package_version="$(dpkg -f "${package}" Version)"
-    package_arch="$(dpkg -f "${package}" Architecture)"
-    printf "\e[1;36m[%s %s] Checking for package %s %s (%s) in current repo cache ...\e[0m " "${codename}" "${components}" "${package_name}" "${package_version}" "${package_arch}"
-    case "${package_arch}" in
-    "all")
-        # shellcheck disable=SC2016
-        filter='Package (=='"${package_name}"'), $Version (=='"${package_version}"')'
-        ;;
-    *)
-        # shellcheck disable=SC2016
-        filter='Package (=='"${package_name}"'), $Version (=='"${package_version}"'), $Architecture (=='"${package_arch}"')'
-        ;;
-    esac
-    if [ -d "${CI_PROJECT_DIR}/.repo/${repo_name}/db" ]; then
-        if $reprepro listfilter "${codename}" "${filter}" | grep -q '.*'; then
-            printf "\e[0;32mOK\e[0m\n"
-            continue
-        fi
-    fi
-    if grep -q "${package##*/}" <<<"${includedebs[@]}"; then
-        printf "\e[0;32mOK\e[0m\n"
-        continue
-    fi
-    printf "\e\033[0;38;5;166mAdding\e[0m\n"
-    includedebs+=("${package}")
+	package_name="$(dpkg -f "${package}" Package)"
+	package_version="$(dpkg -f "${package}" Version)"
+	package_arch="$(dpkg -f "${package}" Architecture)"
+	printf "\e[1;36m[%s %s] Checking for package %s %s (%s) in current repo cache ...\e[0m " "${codename}" "${components}" "${package_name}" "${package_version}" "${package_arch}"
+	case "${package_arch}" in
+	"all")
+		# shellcheck disable=SC2016
+		filter='Package (=='"${package_name}"'), $Version (=='"${package_version}"')'
+		;;
+	*)
+		# shellcheck disable=SC2016
+		filter='Package (=='"${package_name}"'), $Version (=='"${package_version}"'), $Architecture (=='"${package_arch}"')'
+		;;
+	esac
+	if [ -d "${CI_PROJECT_DIR}/.repo/${repo_name}/db" ]; then
+		if $reprepro listfilter "${codename}" "${filter}" | grep -q '.*'; then
+			printf "\e[0;32mOK\e[0m\n"
+			continue
+		fi
+	fi
+	if grep -q "${package##*/}" <<<"${includedebs[@]}"; then
+		printf "\e[0;32mOK\e[0m\n"
+		continue
+	fi
+	printf "\e\033[0;38;5;166mAdding\e[0m\n"
+	includedebs+=("${package}")
 done
 
 # shellcheck disable=SC2128
 if [ -n "${includedebs}" ]; then
-    $reprepro \
-        -vvv \
-        includedeb \
-        "${codename}" \
-        "${includedebs[@]}"
+	$reprepro \
+		-vvv \
+		includedeb \
+		"${codename}" \
+		"${includedebs[@]}"
 fi
 
 if ! $reprepro_basedir -v checkpool fast |& tee /tmp/missing; then
-    printf "\e[0;36mStarting repo cache cleanup ...\e[0m\n"
-    mapfile -t missingfiles < <(grep "Missing file" /tmp/log | grep --color=never -o "/.*\.deb")
-    for missingfile in "${missingfiles[@]}"; do
-        missingfile="${missingfile##*/}"
-        name="$(cut -d'_' -f 1 <<<"${missingfile}")"
-        version="$(cut -d'_' -f 2 <<<"${missingfile}")"
-        echo "cleanup missing file ${missingfile} from repo"
-        $reprepro \
-            -v \
-            remove \
-            "${codename}" \
-            "${name}=${version}"
-    done
+	printf "\e[0;36mStarting repo cache cleanup ...\e[0m\n"
+	mapfile -t missingfiles < <(grep "Missing file" /tmp/log | grep --color=never -o "/.*\.deb")
+	for missingfile in "${missingfiles[@]}"; do
+		missingfile="${missingfile##*/}"
+		name="$(cut -d'_' -f 1 <<<"${missingfile}")"
+		version="$(cut -d'_' -f 2 <<<"${missingfile}")"
+		echo "cleanup missing file ${missingfile} from repo"
+		$reprepro \
+			-v \
+			remove \
+			"${codename}" \
+			"${name}=${version}"
+	done
 fi
 
 cp -rv "${tmpdir}/.repo/${repo_name}"/{dists,pool} "${tmpdir}"/.repo/gpg.key "${repodir}"/