Skip to content

Commit aa097c8

Browse files
committed
Update bug_report.yml
docs Update dependabot.yml Update dependabot.yml Create bug_report.yml Update bug_report.yml Create config.yml
1 parent e5cd892 commit aa097c8

File tree

8 files changed

+94
-29
lines changed

8 files changed

+94
-29
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Bug Report
2+
description: An issue with the build script.
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
### When to open an issue.
8+
9+
If you had an issue with the build script i.e. It failed to build or exited with an error.
10+
11+
Then please make sure you provide the following information:
12+
13+
- What Host are you building on? It should be Alpine but Debian based for script bugs is ok.
14+
- What method to Build? If it's not Docker it should be.
15+
- What build options you used? The relevant part of the log file from `qbt-build/logs`
16+
17+
### When NOT to open an issue.
18+
19+
If you are having a problem with `qBittorrent` that is nothing to do with the build script.
20+
21+
- Read the docs https://userdocs.github.io/qbittorrent-nox-static/ for basic configuration and usage post build.
22+
- If that does not help then open a discussion on the [GitHub Discussions](https://github.com/userdocs/qbittorrent-nox-static/discussions/new/choose) instead of an issue.
23+
- Don't open an issue for generic application issues, only for build script issues.
24+
25+
- type: textarea
26+
attributes:
27+
label: "What's wrong?"

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,9 @@ updates:
55
directory: "/"
66
schedule:
77
interval: "daily"
8+
- package-ecosystem: "npm"
9+
directory: "/docs"
10+
schedule:
11+
interval: "daily"
12+
ignore:
13+
- dependency-name: "*"
Binary file not shown.

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

Lines changed: 44 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ description: Build Help
44
---
55

66
import {
7-
Advanced,
8-
Charts,
9-
Details,
10-
Modal,
11-
Steps,
12-
Tabs,
13-
TabItem,
14-
Card,
15-
CardGrid,
16-
LinkCard,
17-
Aside,
18-
Icon,
7+
Advanced,
8+
Charts,
9+
Details,
10+
Modal,
11+
Steps,
12+
Tabs,
13+
TabItem,
14+
Card,
15+
CardGrid,
16+
LinkCard,
17+
Aside,
18+
Icon,
1919
} from "/src/components/global.jsx";
2020

2121
Once the script has successfully configured the platform you can execute the help switch to see how it works and what options you have available to you.
@@ -24,6 +24,14 @@ Once the script has successfully configured the platform you can execute the hel
2424
./qbittorrent-nox-static.sh -h
2525
```
2626

27+
## Order of preference
28+
29+
The script will use the following order of preference when configuring the build environment:
30+
31+
1. Command line flags
32+
2. `.qbt_env` file in the same directory as the script
33+
3. Exported `env` variables
34+
2735
## ENV settings
2836

2937
The script has some `env` settings that can trigger certain behaviour without the need to pass flags to the script.
@@ -57,19 +65,37 @@ You can export these before you run the script to set them. The can be used for
5765
| `qbt_static_ish` | `no` | `yes` `no` | `qbt_static_ish="no"` |
5866
| `qbt_optimise` | `no` | `yes` `no` | `qbt_optimise="yes"` |
5967

68+
## Build flags
69+
70+
:::note
71+
Using the `qbt_optimise` will only add `-march=native` to the build flags, when not cross compiling.
72+
:::
73+
74+
The script build is already optimised but if you really want to experiment you can use the following flags in the main `env` and they will be appended to the current build flags:
75+
76+
```bash
77+
export CFLAGS=""
78+
export CPPFLAGS=""
79+
export CXXFLAGS=""
80+
export LDFLAGS=""
81+
```
82+
83+
See the `_custom_flags` function in the script for more information.
84+
6085
<Details summary="Cross arch options">
6186
`armel` `armhf` `armv7` `aarch64`
6287

63-
`x86_64` `x86`
88+
`x86` `x86_64`
6489

65-
`s390x`
90+
`s390x`
6691

67-
`powerpc` `ppc64el`
92+
`powerpc` `ppc64el`
6893

69-
`mips` `mipsel` `mips64` `mips64el`
94+
`mips` `mipsel` `mips64` `mips64el`
7095

71-
`riscv64`
96+
`loongarch64`
7297

98+
`riscv64`
7399
</Details>
74100

75101
:::tip
@@ -85,7 +111,7 @@ If you set `qbt_build_tool=qmake` and `qbt_qt_version=5` you can build qBittorre
85111
All switches and flags have a supporting help option that will provide dynamic content where applicable.
86112

87113
:::note
88-
The `--boot-strap-release` and `--boot-strap-multi-arch` options are specific to GitHub actions but if you read `--help-boot-strap-release` you can see how to trigger `aarch64|armv7` builds on your local system using Alpine/Debian/Ubuntu via docker.
114+
The `--bootstrap-release` and `--bootstrap-multi-arch` options are specific to GitHub actions but if you read `--help-bootstrap-release` you can see how to trigger `aarch64|armv7` builds on your local system using Alpine/Debian/Ubuntu via docker.
89115
:::
90116

91117
:::tip[Script Help Options]

docs/src/content/docs/install-qbittorrent.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Optionally installed to `$HOME/bin/qbittorrent-nox`
4343
Optionally you can just download the existing prebuilt binaries released using GitHub Actions.
4444

4545
<Tabs>
46-
<TabItem value="x86_64" label="🔹 x86_64" default>
46+
<TabItem value="x86_64" label="x86_64" default>
4747

4848
Without ICU
4949

@@ -62,7 +62,7 @@ chmod 700 ~/bin/qbittorrent-nox
6262
```
6363

6464
</TabItem>
65-
<TabItem value="aarch64" label="🔹 aarch64">
65+
<TabItem value="aarch64" label="aarch64">
6666

6767
Without ICU
6868

@@ -81,7 +81,7 @@ chmod 700 ~/bin/qbittorrent-nox
8181
```
8282

8383
</TabItem>
84-
<TabItem value="armv7" label="🔹 armv7">
84+
<TabItem value="armv7" label="armv7">
8585

8686
Without ICU
8787

@@ -100,7 +100,7 @@ chmod 700 ~/bin/qbittorrent-nox
100100
```
101101

102102
</TabItem>
103-
<TabItem value="armhf" label="🔹 armhf">
103+
<TabItem value="armhf" label="armhf">
104104

105105
Without ICU
106106

docs/src/content/docs/introduction.mdx

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,31 @@ import { Advanced, BuildInfo, Charts, Details, Modal, Steps, Tabs, TabItem, Card
77

88
## What is it?
99

10-
`qbittorrent-nox-static.sh™` was originally a simple, amateurish bash script, to build a static `qbittorrent-nox` binary for `x86_64`. The script has grown and evolved since then and now it's a complicated bash script.
10+
`qbittorrent-nox-static.sh™` was originally a simple, amateurish bash script, to build a static `qbittorrent-nox` binary for `x86_64`. The script has grown and evolved since then and now it's a complicated bash script.
11+
12+
As of `01/2025`: `qbt-nox-static.bash™` is `v2.1.0` and `qbittorrent-nox-static.sh™` is `v2.0.15`. The former is a fork of the latter, from this version, with changes specific to the dependency handling, which in turn makes breaking changes to the default behaviour of the script. Combined with renaming the script to `.bash` from `.sh` as it is not a POSIX compliant script this would effectively have made `qbittorrent-nox-static.sh` unavailable for use.
13+
14+
So the existence of the two is a transitional change and the `qbittorrent-nox-static.sh` will be deprecated in the future, though any non breaking changes will be backported to the original script.
1115

1216
### What does it do?
1317

14-
It handles a lot of the nuanced complexity around building various different dependencies on two different host platforms, towards the same outcome, whilst targeting these architectures:
18+
It handles a lot of the nuanced complexity around building various different dependencies on two different host platforms, towards the same outcome and can target these architectures via crossbuilding:
1519

1620
<Details summary=" target architectures">
1721
`armel` `armhf` `armv7` `aarch64`
1822

19-
`x86_64` `x86`
23+
`x86` `x86_64`
2024

2125
`s390x`
2226

2327
`powerpc` `ppc64el`
2428

2529
`mips` `mipsel` `mips64` `mips64el`
2630

27-
`riscv64` `loongarch64`
28-
</Details>
31+
`loongarch64`
2932

33+
`riscv64`
34+
</Details>
3035

3136
⭐ On supported host build platforms the `qbittorrent-nox-static.sh` will perform these three main tasks via simple prompt:
3237

@@ -40,7 +45,7 @@ It handles a lot of the nuanced complexity around building various different dep
4045

4146
</Steps>
4247

43-
The script is highly configurable and is capable of native and cross building. These more advanced configurations will be discussed later sections.
48+
The script is highly configurable and is capable of native and cross building. These more advanced configurations will be discussed later sections of the documentation.
4449

4550
### What is the outcome
4651

docs/src/content/docs/script-installation.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Some notes on the dockers method:
2626
- We use a subdirectory `qbt`, not your `$HOME` directory, to avoid `.bashrc` and `.profile` conflicts.
2727
- A subdirectory is automatically created, named `qbt` by the use of `-v $HOME/qbt:/root`
2828
- The default path will be `HOME/qbt` outside the docker container and `/root/qbt` inside it.
29-
- We use `-e "LANG=C.UTF-8"` with Debian based images to avoid some errors.
29+
- We use `-e "LANG=C.UTF-8"` with Debian based images to avoid some UTF errors.
3030

3131
:::tip[env file]
3232
There are multiple ways to pass an env file when using Docker.

0 commit comments

Comments
 (0)