zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-06-04 11:16:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: only use qt6 qmlformat

Browse Source
This commit is contained in:
Kainoa Kanter
2025-11-17 12:57:32 -08:00
parent 3bb8d8a7c2
commit 4a9cea1d84
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bin/dev/qmlfmt.sh
+7 -13
View File
@@ -4,21 +4,15 @@ set -euo pipefail
# QML Formatter Script
# Find qmlformat binary
if command -v qmlformat &>/dev/null; then
QMLFORMAT="qmlformat"
elif [ -x "/usr/lib/qt6/bin/qmlformat" ]; then
QMLFORMAT="/usr/lib/qt6/bin/qmlformat"
elif [ -x "/usr/lib/qt5/bin/qmlformat" ]; then
QMLFORMAT="/usr/lib/qt5/bin/qmlformat"
else
echo "No 'qmlformat' found in PATH or /usr/lib/qt6/bin." >&2
echo "Install it via 'qt6-declarative-tools' or 'qt5-declarative' (depending on your distro) to proceed." >&2
if [ ! -x "/usr/lib/qt6/bin/qmlformat" ]; then
echo "No 'qmlformat' found in /usr/lib/qt6/bin." >&2
echo "Install it via 'qt6-declarative-tools' to proceed." >&2
exit 1
fi
echo "Using 'qmlformat' for formatting: $QMLFORMAT"
export QMLFORMAT
format_file() { "$QMLFORMAT" -w 2 -W 360 -S --semicolon-rule always -i "$1" || { echo "Failed: $1" >&2; return 1; }; }
format_file() {
/usr/lib/qt6/bin/qmlformat -w 2 -W 360 -S --semicolon-rule always -i "$1" || { echo "Failed: $1" >&2; return 1; }
}
export -f format_file
@@ -29,4 +23,4 @@ mapfile -t all_files < <(find "${1:-.}" -name "*.qml" -type f)
echo "Formatting ${#all_files[@]} files..."
printf '%s\0' "${all_files[@]}" | \
xargs -0 -P "${QMLFMT_JOBS:-$(nproc)}" -I {} bash -c 'format_file "$@"' _ {} \
&& echo "Done" || { echo "Errors occurred" >&2; exit 1; }
&& echo "Done" || { echo "Errors occurred" >&2; exit 1; }