Skip to content

Commit b042f36

Browse files
committed
Update qbt-nox-static.bash
Update .pre-commit-config.yaml Update .pre-commit-config.yaml tweak: apk --print-arch Update qbt-nox-static.bash docs docs
1 parent 06b2458 commit b042f36

File tree

5 files changed

+46
-16
lines changed

5 files changed

+46
-16
lines changed

.pre-commit-config.yaml

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
repos:
2+
- repo: local
3+
hooks:
4+
- id: make-scripts-executable
5+
name: Make script files executable
6+
entry: bash -c 'git add --chmod=+x qbt-nox-static.bash qbittorrent-nox-static.sh'
7+
language: system
8+
files: '(qbt-nox-static\.bash|qbittorrent-nox-static\.sh)$'
9+
pass_filenames: false
10+
11+
- repo: https://github.com/pre-commit/pre-commit-hooks
12+
rev: v5.0.0
13+
hooks:
14+
- id: check-yaml
15+
- id: end-of-file-fixer
16+
exclude: ^(docs/|patch/)
17+
- id: trailing-whitespace
18+
- id: check-shebang-scripts-are-executable
19+
220
- repo: https://github.com/woodruffw/zizmor-pre-commit
3-
rev: v1.0.1
21+
rev: v1.11.0
22+
hooks:
23+
- id: zizmor
24+
25+
- repo: https://github.com/koalaman/shellcheck-precommit
26+
rev: v0.10.0
27+
hooks:
28+
- id: shellcheck
29+
args: ["--severity=warning"] # Optionally only show errors and warnings
30+
31+
- repo: https://github.com/pecigonzalo/pre-commit-shfmt
32+
rev: v2.2.0
433
hooks:
5-
- id: zizmor
34+
- id: shell-fmt
35+
args: ["-ci", "-sr", "-i", "0"]

docs/package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/starlight": "^0.34.4",
13+
"@astrojs/starlight": "^0.35.0",
1414
"@expressive-code/plugin-collapsible-sections": "^0.41.1",
15-
"astro": "^5.10.1",
15+
"astro": "^5.11.2",
1616
"gray-matter": "^4.0.3",
1717
"sharp": "^0.32.5",
1818
"starlight-image-zoom": "^0.9.0"

qbittorrent-nox-static.sh

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ os_version_id="$(get_os_info VERSION_ID)"
105105
if [[ "${os_id}" =~ ^(debian|ubuntu)$ ]]; then
106106
os_arch="$(dpkg --print-architecture)"
107107
elif [[ "${os_id}" =~ ^(alpine)$ ]]; then
108-
os_arch="$(apk info --print-arch)"
108+
os_arch="$(apk --print-arch)"
109109
fi
110110

111111
# Check against allowed codenames or if the codename is alpine version greater than 3.10
@@ -1003,7 +1003,7 @@ _set_module_urls() {
10031003
# Configure the source_archive_url associative array for all the applications this script uses and we call them as ${source_archive_url[app_name]}
10041004
##########################################################################################################################################################
10051005
if [[ "${os_id}" =~ ^(debian|ubuntu)$ ]]; then
1006-
source_archive_url[cmake_ninja]="https://github.com/userdocs/qbt-cmake-ninja-crossbuilds/releases/latest/download/${os_id}-${os_version_codename}-cmake-$(dpkg --print-architecture).tar.xz"
1006+
source_archive_url[cmake_ninja]="https://github.com/userdocs/qbt-cmake-ninja-crossbuilds/releases/latest/download/${os_id}-${os_version_codename}-cmake-${os_arch}.tar.xz"
10071007
source_archive_url[glibc]="https://ftpmirror.gnu.org/gnu/libc/${github_tag[glibc]}.tar.xz"
10081008
fi
10091009
source_archive_url[zlib]="https://github.com/zlib-ng/zlib-ng/archive/refs/heads/develop.tar.gz"

qbt-nox-static.bash

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ os_version_id="$(get_os_info VERSION_ID)"
109109
if [[ "${os_id}" =~ ^(debian|ubuntu)$ ]]; then
110110
os_arch="$(dpkg --print-architecture)"
111111
elif [[ "${os_id}" =~ ^(alpine)$ ]]; then
112-
os_arch="$(apk info --print-arch)"
112+
os_arch="$(apk --print-arch)"
113113
fi
114114

115115
# Check against allowed codenames or if the codename is alpine version greater than 3.10
@@ -1223,7 +1223,7 @@ _set_module_urls() {
12231223
# Configure the source_archive_url associative array for all the applications this script uses and we call them as ${source_archive_url[app_name]}
12241224
##########################################################################################################################################################
12251225
if [[ "${os_id}" =~ ^(debian|ubuntu)$ ]]; then
1226-
source_archive_url[cmake_ninja]="https://github.com/userdocs/qbt-cmake-ninja-crossbuilds/releases/latest/download/${os_id}-${os_version_codename}-cmake-$(dpkg --print-architecture).tar.xz"
1226+
source_archive_url[cmake_ninja]="https://github.com/userdocs/qbt-cmake-ninja-crossbuilds/releases/latest/download/${os_id}-${os_version_codename}-cmake-${os_arch}.tar.xz"
12271227
source_archive_url[glibc]="https://ftpmirror.gnu.org/gnu/libc/${github_tag[glibc]}.tar.xz"
12281228
fi
12291229
source_archive_url[zlib]="https://github.com/zlib-ng/zlib-ng/archive/refs/heads/develop.tar.gz"

0 commit comments

Comments
 (0)