revisions

Author: userdocs

.github/workflows/ci-alpine-release.yml

@@ -56,18 +56,22 @@ jobs:
         env:
           lt_version: ${{ matrix.qbt_libtorrent_version }}
         run: |
-          revision="$(jq -r .revision ${lt_version}/*-dependency-version.json | sort -nr | head -n1)"
-          boost="$(jq -r .boost ${lt_version}/*-dependency-version.json | head -n1)"
+          shopt -s nullglob
 
-          for dependency_version_json in ${lt_version}/*-dependency-version.json; do
+          revision="$(jq -r .revision "${lt_version}"/*-dependency-version.json | sort -nr | head -n1)"
+          boost="$(jq -r .boost "${lt_version}"/*-dependency-version.json | head -n1)"
+
+          # this need to check both 1.2 and 2.0 folders to merge the libtorrent versions in the dependency-version.json
+          for dependency_version_json in {1.2,2.0}/*-dependency-version.json; do
             if [[ -f ${dependency_version_json} ]]; then
               sed -r 's/"boost": (.*)/BOOST_PLACEHOLDER/g' -i "${dependency_version_json}"
               sed -r 's/"revision": (.*)/REVISION_PLACEHOLDER/g' -i "${dependency_version_json}"
               dependency_version+=("${dependency_version_json}")
             fi
           done
 
-          for release_md in ${lt_version}/*-release.md; do
+          # This file only needs to merge info specific to the libtorrent matrix running it.
+          for release_md in "${lt_version}"/*-release.md; do
             if [[ -f ${release_md} ]]; then
               sed -r 's/^\|(.*)revision(.*)\|(.*)\|$/REVISION_PLACEHOLDER/g' -i "${release_md}"
               release_md+=("${release_md}")

docs/src/content/docs/build-help.mdx

@@ -252,7 +252,7 @@ Add your patches there, for example.
 
 ## Build - default profile
 
-Install all default modules (ICU is skipped) and build `qbittorrent-nox` to the default build directory `qbt-build/compelted`.
+Install all default modules (ICU is skipped) and build `qbittorrent-nox` to the default build directory `qbt-build/completed`.
 
 ```bash
 ./qbt-nox-static.bash all

qbittorrent-nox-static.sh

@@ -2187,8 +2187,8 @@ _release_info() {
 		|           Libtorrent           | ${app_version[libtorrent]}  |
 		|             Boost              |    ${app_version[boost]}    |
 		|            OpenSSL             |   ${app_version[openssl]}   |
-		|         ${qbt_zlib_type}       |    ${app_version[zlib]}     |
-		|            revision            |   ${qbt_revision_version}   |
+		|        ${qbt_zlib_type}        |    ${app_version[zlib]}     |
+		|            revision            | ${qbt_revision_version:-0}  |
 
 		## Architecture and build info
 

qbt-nox-static.bash

@@ -2380,8 +2380,8 @@ _release_info() {
 		|           Libtorrent           | ${app_version[libtorrent]}  |
 		|             Boost              |    ${app_version[boost]}    |
 		|            OpenSSL             |   ${app_version[openssl]}   |
-		|         ${qbt_zlib_type}       |    ${app_version[zlib]}     |
-		|            revision            |   ${qbt_revision_version}   |
+		|        ${qbt_zlib_type}        |    ${app_version[zlib]}     |
+		|            revision            | ${qbt_revision_version:-0}  |
 
 		## Architecture and build info