fix patch function

Author: userdocs

qbittorrent-nox-static.sh

@@ -1743,17 +1743,33 @@ _apply_patches() {
 				has_content=true
 			fi
 
-			# Step 2: If URL file exists, download and append/merge to patch
+			# Step 2: If URL file exists, download and append/merge to patch (only if not already present)
 			if [[ -f "${patch_dir}/url" && -s "${patch_dir}/url" ]]; then
 				local patch_url tmp_patch="${patch_dir}/url_download.tmp"
 				patch_url="$(< "${patch_dir}/url")"
 
-				if _curl "${patch_url}" -o "${tmp_patch}"; then
-					[[ ${has_content} == true ]] && printf '\n\n# Merged from URL: %s\n' "${patch_url}" >> "${temp_patch}" || printf '# Downloaded from URL: %s\n' "${patch_url}" > "${temp_patch}"
-					cat "${tmp_patch}" >> "${temp_patch}"
-					has_content=true
+				# Check if this URL was already merged by looking for the comment marker
+				if [[ -f "${patch_dir}/patch" ]] && grep -Fq "# Merged from URL: ${patch_url}" "${patch_dir}/patch" 2> /dev/null; then
+					# URL already processed, skip download
+					[[ -f "${patch_dir}/patch" && -s "${patch_dir}/patch" ]] && {
+						cat "${patch_dir}/patch" > "${temp_patch}"
+						has_content=true
+					}
+				elif [[ -f "${patch_dir}/patch" ]] && grep -Fq "# Downloaded from URL: ${patch_url}" "${patch_dir}/patch" 2> /dev/null; then
+					# URL already processed, skip download
+					[[ -f "${patch_dir}/patch" && -s "${patch_dir}/patch" ]] && {
+						cat "${patch_dir}/patch" > "${temp_patch}"
+						has_content=true
+					}
 				else
-					printf '%b\n' " ${unicode_yellow_circle} Failed to download from URL: ${patch_url}"
+					# Download and merge URL content
+					if _curl "${patch_url}" -o "${tmp_patch}"; then
+						[[ ${has_content} == true ]] && printf '\n\n# Merged from URL: %s\n' "${patch_url}" >> "${temp_patch}" || printf '# Downloaded from URL: %s\n' "${patch_url}" > "${temp_patch}"
+						cat "${tmp_patch}" >> "${temp_patch}"
+						has_content=true
+					else
+						printf '%b\n' " ${unicode_yellow_circle} Failed to download from URL: ${patch_url}"
+					fi
 				fi
 				rm -f "${tmp_patch}"
 			fi

qbt-nox-static.bash

@@ -1743,17 +1743,33 @@ _apply_patches() {
 				has_content=true
 			fi
 
-			# Step 2: If URL file exists, download and append/merge to patch
+			# Step 2: If URL file exists, download and append/merge to patch (only if not already present)
 			if [[ -f "${patch_dir}/url" && -s "${patch_dir}/url" ]]; then
 				local patch_url tmp_patch="${patch_dir}/url_download.tmp"
 				patch_url="$(< "${patch_dir}/url")"
 
-				if _curl "${patch_url}" -o "${tmp_patch}"; then
-					[[ ${has_content} == true ]] && printf '\n\n# Merged from URL: %s\n' "${patch_url}" >> "${temp_patch}" || printf '# Downloaded from URL: %s\n' "${patch_url}" > "${temp_patch}"
-					cat "${tmp_patch}" >> "${temp_patch}"
-					has_content=true
+				# Check if this URL was already merged by looking for the comment marker
+				if [[ -f "${patch_dir}/patch" ]] && grep -Fq "# Merged from URL: ${patch_url}" "${patch_dir}/patch" 2> /dev/null; then
+					# URL already processed, skip download
+					[[ -f "${patch_dir}/patch" && -s "${patch_dir}/patch" ]] && {
+						cat "${patch_dir}/patch" > "${temp_patch}"
+						has_content=true
+					}
+				elif [[ -f "${patch_dir}/patch" ]] && grep -Fq "# Downloaded from URL: ${patch_url}" "${patch_dir}/patch" 2> /dev/null; then
+					# URL already processed, skip download
+					[[ -f "${patch_dir}/patch" && -s "${patch_dir}/patch" ]] && {
+						cat "${patch_dir}/patch" > "${temp_patch}"
+						has_content=true
+					}
 				else
-					printf '%b\n' " ${unicode_yellow_circle} Failed to download from URL: ${patch_url}"
+					# Download and merge URL content
+					if _curl "${patch_url}" -o "${tmp_patch}"; then
+						[[ ${has_content} == true ]] && printf '\n\n# Merged from URL: %s\n' "${patch_url}" >> "${temp_patch}" || printf '# Downloaded from URL: %s\n' "${patch_url}" > "${temp_patch}"
+						cat "${tmp_patch}" >> "${temp_patch}"
+						has_content=true
+					else
+						printf '%b\n' " ${unicode_yellow_circle} Failed to download from URL: ${patch_url}"
+					fi
 				fi
 				rm -f "${tmp_patch}"
 			fi