Make pkgversion a function
This commit is contained in:
parent
95de393bf8
commit
dfd62e9457
2 changed files with 4 additions and 3 deletions
|
|
@ -21,8 +21,6 @@
|
||||||
set -e
|
set -e
|
||||||
export LANG=C LC_TIME=C
|
export LANG=C LC_TIME=C
|
||||||
PACKAGE=$(echo $0 |/bin/sed s/make-//g)
|
PACKAGE=$(echo $0 |/bin/sed s/make-//g)
|
||||||
PKGVERSION=$(dpkg-parsechangelog --show-field Version)
|
|
||||||
|
|
||||||
|
|
||||||
export DATE=$(date +'%a, %d %b %Y %T %z')
|
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
|
LOCALMIRROR=http://archive.trisquel.info/trisquel
|
||||||
LOCAL_APT=`mktemp -d`
|
LOCAL_APT=`mktemp -d`
|
||||||
|
|
||||||
|
pkgversion(){
|
||||||
|
dpkg-parsechangelog --show-field Version
|
||||||
|
}
|
||||||
replace(){
|
replace(){
|
||||||
find $3 -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i s^"$1"^"$2"^g {} \;
|
find $3 -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i s^"$1"^"$2"^g {} \;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ cp ./browser/components/preferences/advanced-scripts.xul ./browser/components/pr
|
||||||
|
|
||||||
# KDE integration patches from https://www.rosenauer.org/hg/mozilla
|
# KDE integration patches from https://www.rosenauer.org/hg/mozilla
|
||||||
# Use firefox$MAJORVERSION branch if available, otherwise use default
|
# 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
|
BRANCH=firefox$MAJORVERSION
|
||||||
if ! wget --spider https://rosenauer.org/hg/mozilla/log/$BRANCH; then
|
if ! wget --spider https://rosenauer.org/hg/mozilla/log/$BRANCH; then
|
||||||
BRANCH=default
|
BRANCH=default
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue