kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-14 09:14:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

macOS: follow symlinks when looking for Qt translations

Browse Source 
Homebrew's share/qt/translations is a symlink to the qttranslations keg;
find without -L did not descend into it and found no qtbase_*.qm.
This commit is contained in:
Laurent Trinques
2026-09-11 12:01:15 +02:00
parent 2620d34b59
commit bc06f7d444
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
misc/MacQetDeploy_arm64_cmake.sh
+6 -5
View File
@@ -308,9 +308,10 @@ echo "$(wc -l < "$QM_TMP/built" | tr -d ' ') .qm files copied to Contents/Resour
# on y depose donc chaque qtbase_XX.qm sous le nom qt_XX.qm. qtbase_XX.qm est # on y depose donc chaque qtbase_XX.qm sous le nom qt_XX.qm. qtbase_XX.qm est
# autonome, contrairement aux qt_XX.qm de Qt qui dependent de tous les modules. # autonome, contrairement aux qt_XX.qm de Qt qui dependent de tous les modules.
# Premier dossier contenant des qtbase_*.qm : celui annonce par qtpaths, puis # Premier dossier contenant des qtbase_*.qm : celui annonce par qtpaths, puis
# la formule Homebrew separee qttranslations (non liee dans /opt/homebrew/share, # la formule Homebrew separee qttranslations, puis les autres emplacements
# d'ou l'absence des qtbase_*.qm dans le dossier annonce par qtpaths), puis # Homebrew possibles. Homebrew fait de ces dossiers des liens symboliques
# les autres emplacements Homebrew possibles. # (-> Cellar/qttranslations/...) : find doit donc les suivre (-L), sinon il
# ne voit que le lien lui-meme et ne trouve aucun fichier dedans.
QT_TR_DIR="" QT_TR_DIR=""
for d in "$("$QT_PREFIX/bin/qtpaths" --query QT_INSTALL_TRANSLATIONS 2>/dev/null)" \ for d in "$("$QT_PREFIX/bin/qtpaths" --query QT_INSTALL_TRANSLATIONS 2>/dev/null)" \
"$(brew --prefix qttranslations 2>/dev/null)/share/qt/translations" \ "$(brew --prefix qttranslations 2>/dev/null)/share/qt/translations" \
@@ -323,7 +324,7 @@ for d in "$("$QT_PREFIX/bin/qtpaths" --query QT_INSTALL_TRANSLATIONS 2>/dev/null
fi fi
done done
LANG_DST="$BUNDLE/Contents/Resources/lang" LANG_DST="$BUNDLE/Contents/Resources/lang"
find "$QT_TR_DIR" -maxdepth 1 -name 'qtbase_*.qm' 2>/dev/null | while read f; do find -L "$QT_TR_DIR" -maxdepth 1 -name 'qtbase_*.qm' 2>/dev/null | while read f; do
l=$(basename "$f" .qm | sed 's/^qtbase_//') l=$(basename "$f" .qm | sed 's/^qtbase_//')
cp "$f" "$LANG_DST/qt_$l.qm" cp "$f" "$LANG_DST/qt_$l.qm"
done done
@@ -336,7 +337,7 @@ sed 's/^qet_//' "$QM_TMP/listed" | while read l; do
if [ -e "$main" ]; then if [ -e "$main" ]; then
alt="$main" alt="$main"
else else
alt=$(find "$QT_TR_DIR" -maxdepth 1 -name "qtbase_${l}_*.qm" 2>/dev/null | LC_ALL=C sort | head -1) alt=$(find -L "$QT_TR_DIR" -maxdepth 1 -name "qtbase_${l}_*.qm" 2>/dev/null | LC_ALL=C sort | head -1)
fi fi
[ -n "$alt" ] && cp "$alt" "$LANG_DST/qt_$l.qm" [ -n "$alt" ] && cp "$alt" "$LANG_DST/qt_$l.qm"
fi fi