From f7fd7c5a639be4f924548efc64cb325a60e455e3 Mon Sep 17 00:00:00 2001 From: John Bampton Date: Fri, 28 Nov 2025 03:31:03 +1000 Subject: [PATCH] pre-commit trailing whitespace clean up for shell files pre-commit autoupdate --- .pre-commit-config.yaml | 4 +- .../fr/archives/Tony/zip_documentation.sh | 42 +++++++++---------- .../assets/fr/archives/Tony/zip_faq_wiki.sh | 2 +- assets/it/doc/utenti/nomenu/make-menu.sh | 2 +- assets/it/marketing/nomenu/make-menu.sh | 2 +- assets/porting/freebsd/qa/oooqa11.sh | 2 +- assets/sl/po/ooo-stats.sh | 4 +- assets/sl/pomoc2-1/ooo-pomoc-stats-2.0.sh | 12 +++--- assets/sl/pomoc2-1/ooo-pomoc-stats.sh | 10 ++--- assets/sl/pomoc2/ooo-pomoc-stats.sh | 4 +- assets/tools/scm_migration/convert.sh | 4 +- migration-tools/migration2git.sh | 2 +- migration-tools/migration2git2.sh | 2 +- 13 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5e1e549a92..738cdae679 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: name: run check-hooks-apply description: check hooks apply to the repository - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v6.0.0 hooks: - id: trailing-whitespace - files: \.xml$ + files: \.(sh|xml)$ diff --git a/archive/assets/fr/archives/Tony/zip_documentation.sh b/archive/assets/fr/archives/Tony/zip_documentation.sh index b4283e40ef..23c815d4b7 100644 --- a/archive/assets/fr/archives/Tony/zip_documentation.sh +++ b/archive/assets/fr/archives/Tony/zip_documentation.sh @@ -25,7 +25,7 @@ function ZipOOo() #zip -r $CHEMIN/$2/$3 . -x \*Root -x \*Entries -x \*Repository -x \*Template -x \*CVS\/ # Le paramètre -x permet de ne pas prendre en compte les dossiers CVS zip -r $CHEMIN/$2/$3 . -x \*CVS\/\* - + cd $CHEMIN/$2 cvs -t commit -m "Mise à jour du Zip" $3 else @@ -34,23 +34,23 @@ function ZipOOo() } # **************************************************************************** -ZipOOo "/Documentation/Exemples" "Documentation/zip/exemples.zip" "exemplessxw.zip" -ZipOOo "/Documentation/Exercices" "Documentation/zip/exercices.zip" "exercicessxw.zip" -ZipOOo "/Documentation/Gallery" "Documentation/zip/gallery.zip" "galleryzip.zip" -ZipOOo "/Documentation/Guides" "Documentation/zip/guides.zip" "guidessxw.zip" - -ZipOOo "/Documentation/Macros" "Documentation/zip/macros.zip" "macrossxw.zip" -ZipOOo "/Documentation/modele" "Documentation/zip/modele.zip" "modelesxw.zip" -ZipOOo "/Documentation/Outils" "Documentation/zip/outils.zip" "outilszip.zip" - -ZipOOo "/Documentation/How-to/Basic" "Documentation/How-to/zip" "basic2_zip.zip" -ZipOOo "/Documentation/How-to/Bdd" "Documentation/How-to/zip" "bdd_zip.zip" -ZipOOo "/Documentation/How-to/calc" "Documentation/How-to/zip" "calc_zip.zip" -ZipOOo "/Documentation/How-to/Draw" "Documentation/How-to/zip" "draw_zip.zip" -ZipOOo "/Documentation/How-to/General" "Documentation/How-to/zip" "general_zip.zip" -ZipOOo "/Documentation/How-to/impress" "Documentation/How-to/zip" "impress.zip" -ZipOOo "/Documentation/How-to/Math" "Documentation/How-to/zip" "math_zip.zip" -ZipOOo "/Documentation/How-to/programmation" "Documentation/How-to/zip" "programmation.zip" -ZipOOo "/Documentation/How-to/writer" "Documentation/How-to/zip" "writer2_zip.zip" - -ZipOOo "/Marketing/matexpo/Documents" "Documentation/zip/migration.zip" "migrationsxw.zip" "$sxw" +ZipOOo "/Documentation/Exemples" "Documentation/zip/exemples.zip" "exemplessxw.zip" +ZipOOo "/Documentation/Exercices" "Documentation/zip/exercices.zip" "exercicessxw.zip" +ZipOOo "/Documentation/Gallery" "Documentation/zip/gallery.zip" "galleryzip.zip" +ZipOOo "/Documentation/Guides" "Documentation/zip/guides.zip" "guidessxw.zip" + +ZipOOo "/Documentation/Macros" "Documentation/zip/macros.zip" "macrossxw.zip" +ZipOOo "/Documentation/modele" "Documentation/zip/modele.zip" "modelesxw.zip" +ZipOOo "/Documentation/Outils" "Documentation/zip/outils.zip" "outilszip.zip" + +ZipOOo "/Documentation/How-to/Basic" "Documentation/How-to/zip" "basic2_zip.zip" +ZipOOo "/Documentation/How-to/Bdd" "Documentation/How-to/zip" "bdd_zip.zip" +ZipOOo "/Documentation/How-to/calc" "Documentation/How-to/zip" "calc_zip.zip" +ZipOOo "/Documentation/How-to/Draw" "Documentation/How-to/zip" "draw_zip.zip" +ZipOOo "/Documentation/How-to/General" "Documentation/How-to/zip" "general_zip.zip" +ZipOOo "/Documentation/How-to/impress" "Documentation/How-to/zip" "impress.zip" +ZipOOo "/Documentation/How-to/Math" "Documentation/How-to/zip" "math_zip.zip" +ZipOOo "/Documentation/How-to/programmation" "Documentation/How-to/zip" "programmation.zip" +ZipOOo "/Documentation/How-to/writer" "Documentation/How-to/zip" "writer2_zip.zip" + +ZipOOo "/Marketing/matexpo/Documents" "Documentation/zip/migration.zip" "migrationsxw.zip" "$sxw" diff --git a/archive/assets/fr/archives/Tony/zip_faq_wiki.sh b/archive/assets/fr/archives/Tony/zip_faq_wiki.sh index 787d16908f..9d1052ce1a 100644 --- a/archive/assets/fr/archives/Tony/zip_faq_wiki.sh +++ b/archive/assets/fr/archives/Tony/zip_faq_wiki.sh @@ -51,7 +51,7 @@ wgetFaqWiki "http://wiki.services.openoffice.org/wiki/Fr.openoffice.org/FAQ" "Xm cd /tmp/FaqWiki/wiki.services.openoffice.org/wiki/Fr.openoffice.org/ zip -r FAQ.zip FAQ - + # # ** Envoie sur le serveur CVS ********************************************** cp FAQ.zip /CVS/fr/www/Documentation/zip/faq.zip/faqooohtml.zip cd /CVS/fr/www/Documentation/zip/faq.zip diff --git a/assets/it/doc/utenti/nomenu/make-menu.sh b/assets/it/doc/utenti/nomenu/make-menu.sh index 95884d0894..e59bd2ff23 100755 --- a/assets/it/doc/utenti/nomenu/make-menu.sh +++ b/assets/it/doc/utenti/nomenu/make-menu.sh @@ -2,5 +2,5 @@ for i in *.html; do - cat top.inc $i bottom.inc > ../$i ; + cat top.inc $i bottom.inc > ../$i ; done \ No newline at end of file diff --git a/assets/it/marketing/nomenu/make-menu.sh b/assets/it/marketing/nomenu/make-menu.sh index 95884d0894..e59bd2ff23 100755 --- a/assets/it/marketing/nomenu/make-menu.sh +++ b/assets/it/marketing/nomenu/make-menu.sh @@ -2,5 +2,5 @@ for i in *.html; do - cat top.inc $i bottom.inc > ../$i ; + cat top.inc $i bottom.inc > ../$i ; done \ No newline at end of file diff --git a/assets/porting/freebsd/qa/oooqa11.sh b/assets/porting/freebsd/qa/oooqa11.sh index 1eb2fc883b..08cd8ba2a5 100755 --- a/assets/porting/freebsd/qa/oooqa11.sh +++ b/assets/porting/freebsd/qa/oooqa11.sh @@ -5,7 +5,7 @@ gnome-session & sleep 30 cd /work/ooo/1.1.5/ rm -rf *.core -rm -rf ~/.sversionrc ~/OpenOffice.org1.1.5/ qa/qatesttool/errorlog/maho* +rm -rf ~/.sversionrc ~/OpenOffice.org1.1.5/ qa/qatesttool/errorlog/maho* #create response file TMPBASE=`basename $0` TMPFILE=`mktemp /tmp/${TMPBASE}.XXXXXX` diff --git a/assets/sl/po/ooo-stats.sh b/assets/sl/po/ooo-stats.sh index d9284a436a..fced162bfa 100755 --- a/assets/sl/po/ooo-stats.sh +++ b/assets/sl/po/ooo-stats.sh @@ -148,7 +148,7 @@ for i in `find . -name "*.po"`; cat >> $i~ << "EOF" msgid "foobar1" msgstr "" - + msgid "foobar2" msgstr "foobar2" @@ -171,7 +171,7 @@ EOF rm $i~ # write a row - # if a file has untranslated strings ($UT > 0) then add red point pic (rdeca-pika.png) + # if a file has untranslated strings ($UT > 0) then add red point pic (rdeca-pika.png) SLIKCE="$STANJE" if [ $UT -gt 0 ] diff --git a/assets/sl/pomoc2-1/ooo-pomoc-stats-2.0.sh b/assets/sl/pomoc2-1/ooo-pomoc-stats-2.0.sh index 9c9ab5408b..eea0df7ce1 100755 --- a/assets/sl/pomoc2-1/ooo-pomoc-stats-2.0.sh +++ b/assets/sl/pomoc2-1/ooo-pomoc-stats-2.0.sh @@ -56,7 +56,7 @@ write_html_head()

RazliÄica OOF680_m4 - za OOo 2.2

-

ZadnjiÄ posodobljeno: +

ZadnjiÄ posodobljeno: EOF date +%e.%m.%Y >> whead.tmp @@ -95,7 +95,7 @@ write_html_tail()

Podrobnosti o pomoÄi Filozofske fakultete
-Spletna stran projekta in +Spletna stran projekta in oddelka za prevajalstvo.
Seznam prevajalcev/prevajalk pod vodtsvom Å pele Vintar, ki sodelujejo pri prevajanju:

@@ -191,7 +191,7 @@ for i in `find . -name "*.po"`; ;; esac - # another case - for use of the state of the file (Stanje, 2nd column). + # another case - for use of the state of the file (Stanje, 2nd column). case "$i" in "./sbasic/guide.po" | "./sbasic/shared/01.po" | "./sbasic/shared/02.po" | "./scalc/00.po" | "./scalc/02.po" | "./scalc/04.po" | "./scalc/05.po" | "./scalc.po" | "./schart/00.po" | "./schart/01.po" | "./schart/02.po" | "./schart/04.po" | "./schart.po" | "./sdraw/00.po" | "./sdraw/01.po" | "./sdraw/04.po" | "./sdraw/guide.po" | "./sdraw.po" | "./shared/04.po" | "./shared/05.po" | "./shared/07.po" | "./shared/autokorr.po" | "./shared.po" | "./simpress/00.po" | "./simpress/01.po" | "./simpress/02.po" | "./simpress/04.po" | "./simpress/guide.po" | "./simpress.po" | "./smath/00.po" | "./smath/01.po" | "./smath/02.po" | "./smath/04.po" | "./smath/guide.po" | "./smath.po" | "./swriter/00.po" | "./swriter/02.po" | "./swriter/04.po" | "./swriter/guide.po" | "./swriter.po") STANJE="\"Na" @@ -208,7 +208,7 @@ for i in `find . -name "*.po"`; cat >> $i~ << "EOF" msgid "foobar1" msgstr "" - + msgid "foobar2" msgstr "foobar2" @@ -231,8 +231,8 @@ EOF rm $i~ # write a row - # if a file has untranslated strings ($UT > 0) then add red point pic (rdeca-pika.png) - + # if a file has untranslated strings ($UT > 0) then add red point pic (rdeca-pika.png) + SLIKCE="$STANJE" if [ $UT -gt 0 ] then diff --git a/assets/sl/pomoc2-1/ooo-pomoc-stats.sh b/assets/sl/pomoc2-1/ooo-pomoc-stats.sh index cbcb64e862..b68ce83843 100644 --- a/assets/sl/pomoc2-1/ooo-pomoc-stats.sh +++ b/assets/sl/pomoc2-1/ooo-pomoc-stats.sh @@ -61,7 +61,7 @@ Arhiv:
  • Datoteke za OOo 2.0 -

    ZadnjiÄ posodobljeno: +

    ZadnjiÄ posodobljeno: EOF date +%e.%m.%Y >> whead.tmp @@ -155,7 +155,7 @@ for i in `find . -name "*.po"`; ;; esac - # another case - for use of the state of the file (Stanje, 2nd column). + # another case - for use of the state of the file (Stanje, 2nd column). case "$i" in "./sbasic/guide.po" | "./sbasic/shared/01.po" | "./sbasic/shared/02.po" | "./scalc/00.po" | "./scalc/02.po" | "./scalc/04.po" | "./scalc/05.po" | "./scalc.po" | "./schart/00.po" | "./schart/01.po" | "./schart/02.po" | "./schart/04.po" | "./schart.po" | "./sdraw/00.po" | "./sdraw/01.po" | "./sdraw/04.po" | "./sdraw/guide.po" | "./sdraw.po" | "./shared/04.po" | "./shared/05.po" | "./shared/07.po" | "./shared/autokorr.po" | "./shared.po" | "./simpress/00.po" | "./simpress/01.po" | "./simpress/02.po" | "./simpress/04.po" | "./simpress/guide.po" | "./simpress.po" | "./smath/00.po" | "./smath/01.po" | "./smath/02.po" | "./smath/04.po" | "./smath/guide.po" | "./smath.po" | "./swriter/00.po" | "./swriter/02.po" | "./swriter/04.po" | "./swriter/guide.po" | "./swriter.po") STANJE="\"Na" @@ -172,7 +172,7 @@ for i in `find . -name "*.po"`; cat >> $i~ << "EOF" msgid "foobar1" msgstr "" - + msgid "foobar2" msgstr "foobar2" @@ -195,8 +195,8 @@ EOF rm $i~ # write a row - # if a file has untranslated strings ($UT > 0) then add red point pic (rdeca-pika.png) - + # if a file has untranslated strings ($UT > 0) then add red point pic (rdeca-pika.png) + SLIKCE="$STANJE" if [ $UT -gt 0 ] then diff --git a/assets/sl/pomoc2/ooo-pomoc-stats.sh b/assets/sl/pomoc2/ooo-pomoc-stats.sh index afcdb556f7..829ba54c80 100644 --- a/assets/sl/pomoc2/ooo-pomoc-stats.sh +++ b/assets/sl/pomoc2/ooo-pomoc-stats.sh @@ -37,7 +37,7 @@ write_html_head() -

    ZadnjiÄ posodobljeno: +

    ZadnjiÄ posodobljeno: EOF date +%e.%m.%Y >> whead.tmp @@ -96,7 +96,7 @@ for i in `find . -name "*.po"`; cat >> $i~ << "EOF" msgid "foobar1" msgstr "" - + msgid "foobar2" msgstr "foobar2" diff --git a/assets/tools/scm_migration/convert.sh b/assets/tools/scm_migration/convert.sh index 59d68088e8..3ccdad2ee8 100755 --- a/assets/tools/scm_migration/convert.sh +++ b/assets/tools/scm_migration/convert.sh @@ -11,7 +11,7 @@ then mkdir $SUBVERSION_REPOSITORIES fi -# The following directories had no CVS archive files. Check this is still the +# The following directories had no CVS archive files. Check this is still the # case and skip them. Otherwise complain for i in council distribution fr lang lockdir stats @@ -22,7 +22,7 @@ do fi done -# The to be converted directories. +# The to be converted directories. for i in about api ar az bg bibliographic bizdev bn bo bre br-pt ca contributing cs cvsroot cy da dba de development documentation download dz education el eo es et eu extensions external fa fi framework fur ga gd gl graphics groupware gsl gu he hi hr hu hy id incubator installation it ja ka kde km ko ku l10n lingucomponent list.txt lo look lt lv marketing mg mk ml mlmtest mr ms native-lang ne newlist.txt nl no odftoolkit oi oopm pa pap pl porting printing projects pt qa ro ru sc script scripting secondaryprojects sg si sk sl specs sq sr support sv sw ta te test testprojects tet tg th ti timtest tools tr tt-crh ua ucb udk ui urd user-faq util ux vba vi website webworks whiteboard why wp www xml zh do echo "Converting project ***** $i *****" diff --git a/migration-tools/migration2git.sh b/migration-tools/migration2git.sh index da7771cbf9..0d8bf868eb 100755 --- a/migration-tools/migration2git.sh +++ b/migration-tools/migration2git.sh @@ -36,7 +36,7 @@ find ${1} -type d ! -empty -exec mkdir -p ${GITPATH}/assets/{} \; -exec mkdir -p echo # 2 - Large Assets echo 'copy assets larger than 3M as separate commits' -find ${1} -type f -size +3M -exec cp {} ${GITPATH}/assets/{} \; -exec ${GITPATH}/tools/commit2git.sh assets {} 'large asset' \; +find ${1} -type f -size +3M -exec cp {} ${GITPATH}/assets/{} \; -exec ${GITPATH}/tools/commit2git.sh assets {} 'large asset' \; echo # 3 - Assets echo 'copy assets not (html and mdtext) to assets tree' diff --git a/migration-tools/migration2git2.sh b/migration-tools/migration2git2.sh index 93288dd026..7b215c9582 100755 --- a/migration-tools/migration2git2.sh +++ b/migration-tools/migration2git2.sh @@ -36,7 +36,7 @@ find ${1} -type d ! -empty -exec mkdir -p ${GITPATH}/part2/assets/{} \; -exec mk echo # 2 - Large Assets echo 'copy assets larger than 3M as separate commits' -find ${1} -type f -size +3M -exec cp {} ${GITPATH}/part2/assets/{} \; -exec ${GITPATH}/tools/commit2git.sh assets {} 'large asset' \; +find ${1} -type f -size +3M -exec cp {} ${GITPATH}/part2/assets/{} \; -exec ${GITPATH}/tools/commit2git.sh assets {} 'large asset' \; echo # 3 - Assets echo 'copy assets not (html and mdtext) to assets tree'