v2.0.14

Author: userdocs

.github/workflows/ci-main-reusable-caller.yml

@@ -20,17 +20,17 @@ on:
         default: true
         type: boolean
       icu:
-        description: "enable icu"
+        description: "Enable icu"
         required: true
         default: false
         type: boolean
       debug:
-        description: "debug builds"
+        description: "Debug builds (symbols)"
         required: true
         default: false
         type: boolean
       release:
-        description: "release assets?"
+        description: "Release assets?"
         required: true
         default: true
         type: boolean
@@ -51,14 +51,14 @@ on:
         options: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
 
 concurrency:
-  group: ${{ github.workflow }}-ci-main-reusable-caller
+  group: ci-main-reusable-caller
   cancel-in-progress: true
 
 jobs:
   ci-debian-build:
     if: always() && github.event.inputs.debian-build == 'true'
     concurrency:
-      group: ${{ github.workflow }}-ci-debian-build
+      group: ci-debian-build
       cancel-in-progress: true
     uses: ./.github/workflows/ci-debian-build.yml
     with:
@@ -70,7 +70,7 @@ jobs:
   ci-alpine-build:
     if: always() && github.event.inputs.alpine-build == 'true'
     concurrency:
-      group: ${{ github.workflow }}-ci-alpine-build
+      group: ci-alpine-build
       cancel-in-progress: true
     permissions:
       id-token: write
@@ -87,7 +87,7 @@ jobs:
     needs: [ci-alpine-build]
     if: always() && github.event.inputs.release == 'true' && contains(needs.*.result, 'success') && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled')
     concurrency:
-      group: ${{ github.workflow }}-ci-alpine-release
+      group: ci-alpine-release
       cancel-in-progress: true
     permissions:
       contents: write
@@ -98,9 +98,9 @@ jobs:
 
   ci-auto-rerun-failed-jobs:
     needs: [ci-debian-build, ci-alpine-build, ci-alpine-release]
-    if: failure() && inputs.skip_rerun == '0'
+    if: always() && github.event.inputs.skip_rerun == 'false' && contains(needs.*.result, 'failure')
     concurrency:
-      group: ${{ github.workflow }}-ci-auto-rerun-failed-jobs
+      group: ci-auto-rerun-failed-jobs
       cancel-in-progress: true
     permissions:
       actions: write

qbittorrent-nox-static.sh

@@ -19,7 +19,7 @@
 #################################################################################################################################################
 # Script version = Major minor patch
 #################################################################################################################################################
-script_version="2.0.13"
+script_version="2.0.14"
 #################################################################################################################################################
 # Set some script features - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
 #################################################################################################################################################
@@ -176,7 +176,7 @@ _set_default_values() {
 	qbt_skip_icu="${qbt_skip_icu:-yes}"
 
 	# Env setting for the boost tag
-	if [[ "${qbt_libtorrent_version}" == "1.2" ]]; then
+	if [[ "${qbt_libtorrent_version}" == "1.2" || "${qbt_libtorrent_tag}" =~ ^(v1\.2\.|RC_1_2) ]]; then
 		qbt_boost_tag="${qbt_boost_tag:-boost-1.86.0}"
 	else
 		qbt_boost_tag="${qbt_boost_tag:-}"
@@ -626,7 +626,7 @@ _boost_url() {
 	fi
 
 	local boost_url_array=(
-		"https://boostorg.jfrog.io/artifactory/main/${boost_asset_type}/${github_tag[boost]/boost-/}/source/${boost_asset//[-\.]/_}.tar.gz"
+		"https://github.com/boostorg/boost/${boost_asset_type}s/download/${github_tag[boost]}/${github_tag[boost]}-b2-nodocs.tar.xz"
 		"https://archives.boost.io/${boost_asset_type}/${github_tag[boost]/boost-/}/source/${boost_asset//[-\.]/_}.tar.gz"
 	)
 
@@ -1038,11 +1038,13 @@ _apply_patches() {
 		patch_file="${patch_dir}/patch"
 		patch_url_file="${patch_dir}/url" # A file with a url to raw patch info
 		# remote
-		patch_file_remote="https://raw.githubusercontent.com/${qbt_patches_url}/master/patches/${app_name}/${app_version[${app_name}]}"
+		qbt_patches_url_branch="$(_git_git ls-remote -q --symref "https://github.com/${qbt_patches_url}" HEAD | awk '/^ref:/{sub("refs/heads/", "", $2); print $2}')"
+		# qbt_patches_url_branch="$(_curl -sL "https://github.com/${qbt_patches_url}" | sed -n 's/.*"defaultBranch":"\([^"]*\)".*/\1/p')"
+		patch_file_remote="https://raw.githubusercontent.com/${qbt_patches_url}/${qbt_patches_url_branch}/patches/${app_name}/${app_version[${app_name}]}"
 
 		if [[ "${app_name}" == "libtorrent" ]]; then
 			patch_jamfile="${patch_dir}/Jamfile"
-			patch_jamfile_url="https://raw.githubusercontent.com/${qbt_patches_url}/master/patches/${app_name}/${app_version[${app_name}]}/Jamfile"
+			patch_jamfile_url="https://raw.githubusercontent.com/${qbt_patches_url}/${qbt_patches_url_branch}/patches/${app_name}/${app_version[${app_name}]}/Jamfile"
 		fi
 
 		# Order of patch file preference
@@ -1090,7 +1092,9 @@ _apply_patches() {
 		fi
 
 		# Patch files
-		[[ -f "${patch_file}" ]] && patch -p1 < "${patch_file}"
+		if [[ -f "${patch_file}" ]]; then
+			patch -p1 < "${patch_file}"
+		fi
 
 		# Copy modified files from source directory
 		if [[ -d "${patch_dir}/source" && "$(ls -A "${patch_dir}/source")" ]]; then
@@ -1227,7 +1231,7 @@ _download_file() {
 	fi
 
 	if [[ "${qbt_cache_dir_options}" != "bs" && ! -f "${qbt_dl_file_path}" ]]; then
-		printf '\n%b\n\n' " ${unicode_blue_light_circle} Dowloading ${color_magenta_light}${app_name}${color_end} using ${color_yellow_light}${source_type}${color_end} files to ${color_cyan_light}${qbt_dl_file_path}${color_end} - ${color_yellow_light}${qbt_dl_source_url}${color_end}"
+		printf '\n%b\n\n' " ${unicode_blue_light_circle} Downloading ${color_magenta_light}${app_name}${color_end} using ${color_yellow_light}${source_type}${color_end} files to ${color_cyan_light}${qbt_dl_file_path}${color_end} - ${color_yellow_light}${qbt_dl_source_url}${color_end}"
 	elif [[ -n "${qbt_cache_dir}" && "${qbt_cache_dir_options}" == "bs" && ! -f "${qbt_dl_file_path}" ]]; then
 		printf '\n%b\n' " ${unicode_blue_light_circle} Caching ${color_magenta_light}${app_name}${color_end} ${color_yellow_light}${source_type}${color_end} files to ${color_cyan_light}${qbt_cache_dir}/${app_name}.tar.xz${color_end} - ${color_yellow_light}${qbt_dl_source_url}${color_end}"
 	elif [[ -n "${qbt_cache_dir}" && "${qbt_cache_dir_options}" == "bs" && -f "${qbt_dl_file_path}" ]]; then
@@ -1274,7 +1278,7 @@ _fix_static_links() {
 	for file in "${library_list[@]}"; do
 		if [[ "$(readlink "${lib_dir}/${file}.so")" != "${file}.a" ]]; then
 			ln -fsn "${file}.a" "${lib_dir}/${file}.so"
-			printf 's%b\n' "${lib_dir}${file}.so changed to point to ${file}.a" |& _tee -a "${qbt_install_dir}/logs/${log_name}-fix-static-links.log" > /dev/null
+			printf '%b\n' "${lib_dir}${file}.so changed to point to ${file}.a" |& _tee -a "${qbt_install_dir}/logs/${log_name}-fix-static-links.log" > /dev/null
 		fi
 	done
 	return