Add new option "-s" to run_xgettext. Fix paths.

with this option, current directory is scanned for strings, and message.po is saved in lang/C subdir.
This is usefull when developing new addons outside from friendica tree.

diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh
index 75f85786a846874d3131865637e1ba7a89945d36..8ecfec9446d70df9f6f83a1e848a5f307da5f431 100755 (executable)
--- a/util/run_xgettext.sh
+++ b/util/run_xgettext.sh
@@ -1,34 +1,60 @@
 #!/bin/bash
 FULLPATH=$(dirname $(readlink -f "$0"))
 
-ADDONMODE=
+if [ "$1" == "--help" -o "$1" == "-h" ]
+then
+       echo "$(basename $(readlink -f "$0")) [options]"
+       echo
+       echo "-a | --addon <name>       extract strings from addon 'name'"
+       echo "-s | --single                             single addon mode: extract string from current folder"
+       exit
+fi
+
+MODE='default'
 ADDONNAME=
 if [ "$1" == "--addon" -o "$1" == "-a" ]
 then
-       ADDONMODE=1
+       MODE='addon'
        if [ -z $2 ]; then echo -e "ERROR: missing addon name\n\nrun_xgettext.sh -a <addonname>"; exit 1; fi
        ADDONNAME=$2
        if [ ! -d "$FULLPATH/../addon/$ADDONNAME" ]; then echo "ERROR: addon '$ADDONNAME' not found"; exit 2; fi
 fi
 
-if [ $ADDONMODE ]
+if [ "$1" == "--single" -o "$1" == "-s" ]
 then
-       cd "$FULLPATH/../addon/$ADDONNAME"
-       mkdir -p "$FULLPATH/../addon/$ADDONNAME/lang/C"
-       OUTFILE="$FULLPATH/../addon/$ADDONNAME/lang/C/messages.po"
-       FINDSTARTDIR="."
-       FINDOPTS=
-else
-       cd "$FULLPATH/../view/en/"
-       OUTFILE="$FULLPATH/messages.po"
-       FINDSTARTDIR="../../"
-       # skip addon folder
-       FINDOPTS="( -wholename */addon -or -wholename */smarty3 ) -prune -o"
+       MODE='single'
 fi
 
-F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php);
 
-echo "Friendica version $F9KVERSION"
+case "$MODE" in
+       'addon')
+               cd "$FULLPATH/../addon/$ADDONNAME"
+               mkdir -p "$FULLPATH/../addon/$ADDONNAME/lang/C"
+               OUTFILE="$FULLPATH/../addon/$ADDONNAME/lang/C/messages.po"
+               FINDSTARTDIR="."
+               FINDOPTS=
+       ;;
+       'single')
+               FULLPATH=$PWD
+               ADDONNAME=$(basename $FULLPATH)
+               mkdir -p "$FULLPATH/lang/C"
+               OUTFILE="$FULLPATH/lang/C/messages.po"
+               FINDSTARTDIR="."
+               FINDOPTS=               
+               echo "Extract strings for single addon '$ADDONNAME'"
+       ;;
+       'default')
+               cd "$FULLPATH/.."
+               OUTFILE="$FULLPATH/messages.po"
+               FINDSTARTDIR="."
+               # skip addon folder
+               FINDOPTS="( -wholename */addon -or -wholename */smarty3 ) -prune -o"
+               
+               F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ./boot.php);
+               echo "Friendica version $F9KVERSION"
+       ;;
+esac
+
 
 KEYWORDS="-k -kt -ktt:1,2"
 
@@ -44,26 +70,28 @@ do
 done
 
 echo "setup base info.."
-if [ $ADDONMODE ]
-then
-       sed -i "s/SOME DESCRIPTIVE TITLE./ADDON $ADDONNAME/g" "$OUTFILE"
-       sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER//g" "$OUTFILE"
-       sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.//g" "$OUTFILE"
-       sed -i "s/PACKAGE VERSION//g" "$OUTFILE"
-       sed -i "s/PACKAGE/Friendica $ADDONNAME addon/g" "$OUTFILE"
-       sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
-       sed -i "s/^\"Plural-Forms.*$//g" "$OUTFILE"
-else
-       sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDICA Distributed Social Network/g" "$OUTFILE"
-       sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010, 2011, 2012, 2013 the Friendica Project/g" "$OUTFILE"
-       sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2010/g" "$OUTFILE"
-       sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"
-       sed -i "s/PACKAGE/Friendica/g" "$OUTFILE"
-       sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
-       sed -i "s/^\"Plural-Forms.*$//g" "$OUTFILE"
-fi
+case "$MODE" in 
+       'addon'|'single')
+               sed -i "s/SOME DESCRIPTIVE TITLE./ADDON $ADDONNAME/g" "$OUTFILE"
+               sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER//g" "$OUTFILE"
+               sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.//g" "$OUTFILE"
+               sed -i "s/PACKAGE VERSION//g" "$OUTFILE"
+               sed -i "s/PACKAGE/Friendica $ADDONNAME addon/g" "$OUTFILE"
+               sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
+               sed -i "s/^\"Plural-Forms.*$//g" "$OUTFILE"
+       ;;
+       'default')
+               sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDICA Distributed Social Network/g" "$OUTFILE"
+               sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010, 2011, 2012, 2013 the Friendica Project/g" "$OUTFILE"
+               sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2010/g" "$OUTFILE"
+               sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"
+               sed -i "s/PACKAGE/Friendica/g" "$OUTFILE"
+               sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
+               sed -i "s/^\"Plural-Forms.*$//g" "$OUTFILE"
+       ;;
+esac
 
-if [ "" != "$1" -a "$ADDONMODE" == "" ]
+if [ "" != "$1" -a "$MODE" == "default" ]
 then
        UPDATEFILE="$(readlink -f ${FULLPATH}/$1)"
        echo "merging new strings to $UPDATEFILE.."