From d392de47a448c154bd601085d699f933317247e0 Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Thu, 17 May 2018 19:04:47 +0200 Subject: [PATCH] TT#29620 Clean TAP test warning: For loops over find output are fragile. Use find -exec or a while read loop [SC2044] Change-Id: I8bfab949c5fd9ef650cf65d90de39f45336b6f16 --- script/extract_i18n.sh | 6 +++--- script/revert-vagrant-dev-env.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/script/extract_i18n.sh b/script/extract_i18n.sh index 4357684f5a..f374eb9561 100755 --- a/script/extract_i18n.sh +++ b/script/extract_i18n.sh @@ -32,10 +32,10 @@ xgettext.pl \ $DIRS \ -P perl=tt,pm -for po in $(find lib/NGCP/Panel/I18N -name "*.po"); do +while IFS= read -r -d '' po ; do echo; echo "Merging $po"; echo - msgmerge --no-fuzzy-matching --add-location=file --update $po $POT -done + msgmerge --no-fuzzy-matching --add-location=file --update "$po" "$POT" +done < <(find lib/NGCP/Panel/I18N -name "*.po" -print0) echo; echo "Removing line numbers"; echo sed -i -e '/#: /s!\(\(lib\|share\)\S*\):[0-9]*!\1!g' lib/NGCP/Panel/I18N/* diff --git a/script/revert-vagrant-dev-env.sh b/script/revert-vagrant-dev-env.sh index 9d447238a5..922b329d17 100644 --- a/script/revert-vagrant-dev-env.sh +++ b/script/revert-vagrant-dev-env.sh @@ -1,10 +1,10 @@ #!/bin/bash -for i in $(find /usr/ -name "*.orig"); do +while IFS= read -r -d '' i ; do f=${i%.orig}; if [ -L "$f" ]; then echo "reverting $i to $f" - rm $f - mv $i $f + rm "$f" + mv "$i" "$f" fi -done +done < <(find /usr/ -name "*.orig" -print0)