Skip to content

E
etersoft-build-utils
You need to sign in or sign up before continuing.
Commit 68db61bd authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

repl: separate filter_deb_pkgnames

parent 8c775952
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
share/eterbuild/functions/repl
View file @ 68db61bd
...@@ -3,7 +3,11 @@ ...@@ -3,7 +3,11 @@
# Author: Vitaly Lipatov <lav@etersoft.ru> # Author: Vitaly Lipatov <lav@etersoft.ru>
# Public domain # Public domain
PKGREPLBASE=$ETERBUILDDIR/pkgrepl # convert pkg names to Debian style
filter_deb_pkgnames()
{
sed -e "s|^ *\(.*\)-devel *\$|\1-dev|g" | tr "[A-Z]" "[a-z]"
}
# Get replacement rule for ALT package to local in $1 (scan for files in $@) # Get replacement rule for ALT package to local in $1 (scan for files in $@)
# sets ALTPKGNAME, TARGETPKGNAME variable # sets ALTPKGNAME, TARGETPKGNAME variable
...@@ -29,10 +33,8 @@ tolocal_anyrepl() ...@@ -29,10 +33,8 @@ tolocal_anyrepl()
test -n "$REPLRULE" && return 0 test -n "$REPLRULE" && return 0
done done
# Hack for default replace -devel to -dev on Deb target
# Fix upper case
if [ "$PKGFORMAT" = "deb" ] ; then if [ "$PKGFORMAT" = "deb" ] ; then
local NEWRESULT=`echo $GREP | sed -e "s|^ *\(.*\)-devel *\$|\1-dev|g" | tr "[A-Z]" "[a-z]"` local NEWRESULT=`echo $GREP | filter_deb_pkgnames`
[ "$NEWRESULT" = "$GREP" ] && return 1 [ "$NEWRESULT" = "$GREP" ] && return 1
ALTPKGNAME=$GREP ALTPKGNAME=$GREP
TARGETPKGNAME="$NEWRESULT" TARGETPKGNAME="$NEWRESULT"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment