Use activitites and remove unused config

[friendica.git] / bin / run_xgettext.sh

diff --git a/bin/run_xgettext.sh b/bin/run_xgettext.sh
index 933682da58847be2984ea0fd7a2d2bba48afb158..0768ed4f143047d2628f879609c9817bee811560 100755 (executable)
--- a/bin/run_xgettext.sh
+++ b/bin/run_xgettext.sh
@@ -36,7 +36,6 @@ then
        MODE='single'
 fi
 
-
 case "$MODE" in
        'addon')
                cd "$FULLPATH/../addon/$ADDONNAME"
@@ -59,7 +58,7 @@ case "$MODE" in
                OUTFILE="$FULLPATH/../view/lang/C/messages.po"
                FINDSTARTDIR="."
                # skip addon folder
-               FINDOPTS="( -path ./addon -or -path ./addons -or -path ./addons-extra -or -path ./tests -or -path ./view/lang -or -path ./view/smarty3 -or -path ./vendor ) -prune -or"
+               FINDOPTS="( -path ./addon -or -path ./addons -or -path ./addons-extra -or -path ./tests -or -path ./view/lang -or -path ./view/smarty3 -or -path ./vendor  -or -path ./local  -or -path ./avatar -or -path ./proxy ) -prune -or"
                
                F9KVERSION=$(cat ./VERSION);
                echo "Friendica version $F9KVERSION"
@@ -70,26 +69,27 @@ esac
 KEYWORDS="-k -kt -ktt:1,2"
 
 echo "Extract strings to $OUTFILE.."
-rm "$OUTFILE"; touch "$OUTFILE"
+[ -f "$OUTFILE" ] && rm "$OUTFILE"; touch "$OUTFILE"
 
-# shellcheck disable=SC2086  # FINDOPTS is meant to be splitted
+# shellcheck disable=SC2086  # $FINDOPTS is meant to be split
 find_result=$(find "$FINDSTARTDIR" $FINDOPTS -name "*.php" -type f | LC_ALL=C sort --stable)
 
 total_files=$(wc -l <<< "${find_result}")
 
+count=1
 for file in $find_result
 do
-       ((count++))
        echo -ne "                                            \r"
        echo -ne "Reading file $count/$total_files..."
 
        # On Windows, find still outputs the name of pruned folders
        if [ ! -d "$file" ]
        then
-               # shellcheck disable=SC2086  # KEYWORDS is meant to be splitted
+               # shellcheck disable=SC2086  # $KEYWORDS is meant to be split
                xgettext $KEYWORDS -j -o "$OUTFILE" --from-code=UTF-8 "$file" || exit 1
                sed -i.bkp "s/CHARSET/UTF-8/g" "$OUTFILE"
        fi
+       (( count++ ))
 done
 echo -ne "\n"
 
@@ -121,4 +121,6 @@ then
        msgmerge -U "$OUTFILE" "$UPDATEFILE"
 fi
 
+[ -f "$OUTFILE.bkp" ] && rm "$OUTFILE.bkp" 
+
 echo "Done."