Make pkgversion a function

helpers/config

@@ -21,8 +21,6 @@
 set -e
 export LANG=C LC_TIME=C
 PACKAGE=$(echo $0 |/bin/sed s/make-//g)
-PKGVERSION=$(dpkg-parsechangelog --show-field Version)
-
 
 export DATE=$(date +'%a, %d %b %Y %T %z')
 
@@ -49,6 +47,9 @@ DEVELMIRROR=http://devel.trisquel.info/trisquel/$CODENAME
 LOCALMIRROR=http://archive.trisquel.info/trisquel
 LOCAL_APT=`mktemp -d` 
 
+pkgversion(){
+	dpkg-parsechangelog --show-field Version
+}
 replace(){
 find $3 -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i s^"$1"^"$2"^g {} \;
 }

helpers/make-firefox

@@ -30,7 +30,7 @@ cp ./browser/components/preferences/advanced-scripts.xul ./browser/components/pr
 
 # KDE integration patches from https://www.rosenauer.org/hg/mozilla
 # Use firefox$MAJORVERSION branch if available, otherwise use default
-MAJORVERSION=echo "$PKGVERSION" | sed 's/\([0-9]\+\).*/\1/'
+MAJORVERSION=echo `pkgversion` | sed 's/\([0-9]\+\).*/\1/'
 BRANCH=firefox$MAJORVERSION
 if ! wget --spider https://rosenauer.org/hg/mozilla/log/$BRANCH; then
 	BRANCH=default