fix: auto-fix linting issues

2026-05-30 04:14:04 +02:00 · 2025-11-23 00:35:42 +00:00
parent e65858ced9
commit 41f76f0d29
50 changed files with 286 additions and 286 deletions
--- a/qbittorrent/rootfs/usr/local/bin/resolvconf
+++ b/qbittorrent/rootfs/usr/local/bin/resolvconf
@@ -7,80 +7,80 @@ BACKUP_FILE="${STATE_DIR}/resolv.conf.backup"
 mkdir -p "${STATE_DIR}"

 if [ "$#" -eq 0 ]; then
-    exit 0
+	exit 0
 fi

 command="$1"
 shift || true

 restore_backup() {
-    if [ -f "${BACKUP_FILE}" ]; then
-        cat "${BACKUP_FILE}" > /etc/resolv.conf
-    fi
+	if [ -f "${BACKUP_FILE}" ]; then
+		cat "${BACKUP_FILE}" >/etc/resolv.conf
+	fi
 }

 apply_dns() {
-    iface="$1"
-    shift || true
+	iface="$1"
+	shift || true

-    # Skip optional arguments such as -m <metric> or -x
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -m|-p|-w)
-                shift 2 || true
-                ;;
-            -x|-y|-Z)
-                shift 1 || true
-                ;;
-            --)
-                shift
-                break
-                ;;
-            *)
-                break
-                ;;
-        esac
-    done
+	# Skip optional arguments such as -m <metric> or -x
+	while [ "$#" -gt 0 ]; do
+		case "$1" in
+		-m | -p | -w)
+			shift 2 || true
+			;;
+		-x | -y | -Z)
+			shift 1 || true
+			;;
+		--)
+			shift
+			break
+			;;
+		*)
+			break
+			;;
+		esac
+	done

-    tmp_file="${STATE_DIR}/${iface}.conf"
-    cat > "${tmp_file}"
+	tmp_file="${STATE_DIR}/${iface}.conf"
+	cat >"${tmp_file}"

-    if [ ! -f "${BACKUP_FILE}" ]; then
-        cp /etc/resolv.conf "${BACKUP_FILE}" 2>/dev/null || true
-    fi
+	if [ ! -f "${BACKUP_FILE}" ]; then
+		cp /etc/resolv.conf "${BACKUP_FILE}" 2>/dev/null || true
+	fi

-    {
-        echo "# Generated by WireGuard add-on resolvconf shim"
-        cat "${tmp_file}"
-    } > /etc/resolv.conf
+	{
+		echo "# Generated by WireGuard add-on resolvconf shim"
+		cat "${tmp_file}"
+	} >/etc/resolv.conf
 }

 case "${command}" in
-    -a)
-        if [ "$#" -eq 0 ]; then
-            exit 0
-        fi
-        apply_dns "$@"
-        ;;
-    -d)
-        if [ "$#" -gt 0 ]; then
-            rm -f "${STATE_DIR}/$1.conf"
-        fi
-        restore_backup
-        ;;
-    -u)
-        latest_conf="$(find "${STATE_DIR}" -maxdepth 1 -type f -name '*.conf' -print | head -n 1 || true)"
-        if [ -n "${latest_conf}" ] && [ -f "${latest_conf}" ]; then
-            {
-                echo "# Generated by WireGuard add-on resolvconf shim"
-                cat "${latest_conf}"
-            } > /etc/resolv.conf
-        else
-            restore_backup
-        fi
-        ;;
-    *)
-        # Treat other commands as successful no-ops to remain compatible with wg-quick.
-        exit 0
-        ;;
+-a)
+	if [ "$#" -eq 0 ]; then
+		exit 0
+	fi
+	apply_dns "$@"
+	;;
+-d)
+	if [ "$#" -gt 0 ]; then
+		rm -f "${STATE_DIR}/$1.conf"
+	fi
+	restore_backup
+	;;
+-u)
+	latest_conf="$(find "${STATE_DIR}" -maxdepth 1 -type f -name '*.conf' -print | head -n 1 || true)"
+	if [ -n "${latest_conf}" ] && [ -f "${latest_conf}" ]; then
+		{
+			echo "# Generated by WireGuard add-on resolvconf shim"
+			cat "${latest_conf}"
+		} >/etc/resolv.conf
+	else
+		restore_backup
+	fi
+	;;
+*)
+	# Treat other commands as successful no-ops to remain compatible with wg-quick.
+	exit 0
+	;;
 esac
--- a/qbittorrent/rootfs/usr/local/sbin/ip6tables-restore
+++ b/qbittorrent/rootfs/usr/local/sbin/ip6tables-restore
@@ -3,68 +3,68 @@ set -euo pipefail

 REAL_IP6TABLES_RESTORE="/sbin/ip6tables-restore"
 if [[ ! -x "${REAL_IP6TABLES_RESTORE}" ]]; then
-    REAL_IP6TABLES_RESTORE="/usr/sbin/ip6tables-restore"
+	REAL_IP6TABLES_RESTORE="/usr/sbin/ip6tables-restore"
 fi

 cleanup() {
-    [[ -n "${RULES_FILE:-}" && -f "${RULES_FILE}" ]] && rm -f "${RULES_FILE}"
-    [[ -n "${SANITIZED_FILE:-}" && -f "${SANITIZED_FILE}" ]] && rm -f "${SANITIZED_FILE}"
+	[[ -n "${RULES_FILE:-}" && -f "${RULES_FILE}" ]] && rm -f "${RULES_FILE}"
+	[[ -n "${SANITIZED_FILE:-}" && -f "${SANITIZED_FILE}" ]] && rm -f "${SANITIZED_FILE}"
 }
 trap cleanup EXIT

 RULES_FILE="$(mktemp)"
-cat > "${RULES_FILE}"
+cat >"${RULES_FILE}"

 ipv6_unavailable() {
-    local message="$1"
-    [[ $message =~ [Tt]able[[:space:]]does[[:space:]]not[[:space:]]exist ]] && return 0
-    [[ $message =~ address[[:space:]]family[[:space:]]not[[:space:]]supported ]] && return 0
-    [[ $message =~ can[[:punct:]]t[[:space:]]initialize[[:space:]]ip6tables[[:space:]]table ]] && return 0
-    [[ $message =~ IPv6[[:space:]]support[[:space:]]not[[:space:]]available ]] && return 0
-    return 1
+	local message="$1"
+	[[ $message =~ [Tt]able[[:space:]]does[[:space:]]not[[:space:]]exist ]] && return 0
+	[[ $message =~ address[[:space:]]family[[:space:]]not[[:space:]]supported ]] && return 0
+	[[ $message =~ can[[:punct:]]t[[:space:]]initialize[[:space:]]ip6tables[[:space:]]table ]] && return 0
+	[[ $message =~ IPv6[[:space:]]support[[:space:]]not[[:space:]]available ]] && return 0
+	return 1
 }

 # First attempt with the original ruleset
 output=""
-if output="$(${REAL_IP6TABLES_RESTORE} "$@" < "${RULES_FILE}" 2>&1)"; then
-    [[ -n "${output}" ]] && printf '%s\n' "${output}" >&2
-    exit 0
+if output="$(${REAL_IP6TABLES_RESTORE} "$@" <"${RULES_FILE}" 2>&1)"; then
+	[[ -n "${output}" ]] && printf '%s\n' "${output}" >&2
+	exit 0
 fi
 status=$?

 # Retry without comment matches if the kernel is missing the comment module
 SANITIZED_FILE="$(mktemp)"
-sed -E 's/-m[[:space:]]+comment[[:space:]]+--comment[[:space:]]+"[^"]*"//g' "${RULES_FILE}" > "${SANITIZED_FILE}"
+sed -E 's/-m[[:space:]]+comment[[:space:]]+--comment[[:space:]]+"[^"]*"//g' "${RULES_FILE}" >"${SANITIZED_FILE}"

 retry_output=""
-if retry_output="$(${REAL_IP6TABLES_RESTORE} "$@" < "${SANITIZED_FILE}" 2>&1)"; then
-    printf '%s\n' "ip6tables-restore failed with comment matches; reapplied without comments." >&2
-    printf '%s\n' "Original error: ${output}" >&2
-    [[ -n "${retry_output}" ]] && printf '%s\n' "${retry_output}" >&2
-    exit 0
+if retry_output="$(${REAL_IP6TABLES_RESTORE} "$@" <"${SANITIZED_FILE}" 2>&1)"; then
+	printf '%s\n' "ip6tables-restore failed with comment matches; reapplied without comments." >&2
+	printf '%s\n' "Original error: ${output}" >&2
+	[[ -n "${retry_output}" ]] && printf '%s\n' "${retry_output}" >&2
+	exit 0
 fi
 retry_status=$?

 # Final fallback: try legacy backend if available
 legacy_output=""
 for legacy in /sbin/ip6tables-restore-legacy /usr/sbin/ip6tables-restore-legacy; do
-    if [[ -x "${legacy}" ]]; then
-        if legacy_output="$(${legacy} "$@" < "${RULES_FILE}" 2>&1)"; then
-            printf '%s\n' "ip6tables-restore failed; succeeded using legacy backend." >&2
-            printf '%s\n' "Original error: ${output}" >&2
-            [[ -n "${legacy_output}" ]] && printf '%s\n' "${legacy_output}" >&2
-            exit 0
-        fi
-    fi
+	if [[ -x "${legacy}" ]]; then
+		if legacy_output="$(${legacy} "$@" <"${RULES_FILE}" 2>&1)"; then
+			printf '%s\n' "ip6tables-restore failed; succeeded using legacy backend." >&2
+			printf '%s\n' "Original error: ${output}" >&2
+			[[ -n "${legacy_output}" ]] && printf '%s\n' "${legacy_output}" >&2
+			exit 0
+		fi
+	fi

 done

 if ipv6_unavailable "${output}" || ipv6_unavailable "${retry_output}" || ipv6_unavailable "${legacy_output}"; then
-    printf '%s\n' "IPv6 firewall support not detected; skipping IPv6 ruleset restore and continuing." >&2
-    printf '%s\n' "Original error: ${output}" >&2
-    [[ -n "${retry_output}" ]] && printf '%s\n' "Sanitized retry error: ${retry_output}" >&2
-    [[ -n "${legacy_output}" ]] && printf '%s\n' "Legacy backend error: ${legacy_output}" >&2
-    exit 0
+	printf '%s\n' "IPv6 firewall support not detected; skipping IPv6 ruleset restore and continuing." >&2
+	printf '%s\n' "Original error: ${output}" >&2
+	[[ -n "${retry_output}" ]] && printf '%s\n' "Sanitized retry error: ${retry_output}" >&2
+	[[ -n "${legacy_output}" ]] && printf '%s\n' "Legacy backend error: ${legacy_output}" >&2
+	exit 0
 fi

 printf '%s\n' "ip6tables-restore failed and fallbacks were unsuccessful." >&2
--- a/qbittorrent/rootfs/usr/local/sbin/iptables-restore
+++ b/qbittorrent/rootfs/usr/local/sbin/iptables-restore
@@ -3,47 +3,47 @@ set -euo pipefail

 REAL_IPTABLES_RESTORE="/sbin/iptables-restore"
 if [[ ! -x "${REAL_IPTABLES_RESTORE}" ]]; then
-    REAL_IPTABLES_RESTORE="/usr/sbin/iptables-restore"
+	REAL_IPTABLES_RESTORE="/usr/sbin/iptables-restore"
 fi

 cleanup() {
-    [[ -n "${RULES_FILE:-}" && -f "${RULES_FILE}" ]] && rm -f "${RULES_FILE}"
-    [[ -n "${SANITIZED_FILE:-}" && -f "${SANITIZED_FILE}" ]] && rm -f "${SANITIZED_FILE}"
+	[[ -n "${RULES_FILE:-}" && -f "${RULES_FILE}" ]] && rm -f "${RULES_FILE}"
+	[[ -n "${SANITIZED_FILE:-}" && -f "${SANITIZED_FILE}" ]] && rm -f "${SANITIZED_FILE}"
 }
 trap cleanup EXIT

 RULES_FILE="$(mktemp)"
-cat > "${RULES_FILE}"
+cat >"${RULES_FILE}"

 # First attempt with the original ruleset
-if output="$(${REAL_IPTABLES_RESTORE} "$@" < "${RULES_FILE}" 2>&1)"; then
-    [[ -n "${output}" ]] && printf '%s\n' "${output}" >&2
-    exit 0
+if output="$(${REAL_IPTABLES_RESTORE} "$@" <"${RULES_FILE}" 2>&1)"; then
+	[[ -n "${output}" ]] && printf '%s\n' "${output}" >&2
+	exit 0
 fi
 status=$?

 # Retry without comment matches if the kernel is missing the comment module
 SANITIZED_FILE="$(mktemp)"
-sed -E 's/-m[[:space:]]+comment[[:space:]]+--comment[[:space:]]+"[^"]*"//g' "${RULES_FILE}" > "${SANITIZED_FILE}"
+sed -E 's/-m[[:space:]]+comment[[:space:]]+--comment[[:space:]]+"[^"]*"//g' "${RULES_FILE}" >"${SANITIZED_FILE}"

-if retry_output="$(${REAL_IPTABLES_RESTORE} "$@" < "${SANITIZED_FILE}" 2>&1)"; then
-    printf '%s\n' "iptables-restore failed with comment matches; reapplied without comments." >&2
-    printf '%s\n' "Original error: ${output}" >&2
-    [[ -n "${retry_output}" ]] && printf '%s\n' "${retry_output}" >&2
-    exit 0
+if retry_output="$(${REAL_IPTABLES_RESTORE} "$@" <"${SANITIZED_FILE}" 2>&1)"; then
+	printf '%s\n' "iptables-restore failed with comment matches; reapplied without comments." >&2
+	printf '%s\n' "Original error: ${output}" >&2
+	[[ -n "${retry_output}" ]] && printf '%s\n' "${retry_output}" >&2
+	exit 0
 fi
 retry_status=$?

 # Final fallback: try legacy backend if available
 for legacy in /sbin/iptables-restore-legacy /usr/sbin/iptables-restore-legacy; do
-    if [[ -x "${legacy}" ]]; then
-        if legacy_output="$(${legacy} "$@" < "${RULES_FILE}" 2>&1)"; then
-            printf '%s\n' "iptables-restore failed; succeeded using legacy backend." >&2
-            printf '%s\n' "Original error: ${output}" >&2
-            [[ -n "${legacy_output}" ]] && printf '%s\n' "${legacy_output}" >&2
-            exit 0
-        fi
-    fi
+	if [[ -x "${legacy}" ]]; then
+		if legacy_output="$(${legacy} "$@" <"${RULES_FILE}" 2>&1)"; then
+			printf '%s\n' "iptables-restore failed; succeeded using legacy backend." >&2
+			printf '%s\n' "Original error: ${output}" >&2
+			[[ -n "${legacy_output}" ]] && printf '%s\n' "${legacy_output}" >&2
+			exit 0
+		fi
+	fi
 done

 printf '%s\n' "iptables-restore failed and fallbacks were unsuccessful." >&2
--- a/qbittorrent/rootfs/usr/local/sbin/sysctl
+++ b/qbittorrent/rootfs/usr/local/sbin/sysctl
@@ -3,15 +3,15 @@ set -euo pipefail

 REAL_SYSCTL="/sbin/sysctl"
 if [[ ! -x "${REAL_SYSCTL}" ]]; then
-    REAL_SYSCTL="/usr/sbin/sysctl"
+	REAL_SYSCTL="/usr/sbin/sysctl"
 fi

 if [[ "$#" -ge 2 && "$1" == "-q" && "$2" == "net.ipv4.conf.all.src_valid_mark=1" ]]; then
-    if "${REAL_SYSCTL}" "$@" >/dev/null 2>&1; then
-        exit 0
-    fi
-    # Suppress failure for this specific key to keep wg-quick from aborting in unprivileged environments.
-    exit 0
+	if "${REAL_SYSCTL}" "$@" >/dev/null 2>&1; then
+		exit 0
+	fi
+	# Suppress failure for this specific key to keep wg-quick from aborting in unprivileged environments.
+	exit 0
 fi

 exec "${REAL_SYSCTL}" "$@"