repl: small fixes

share/eterbuild/functions/repl

@@ -94,7 +94,7 @@ internal_repl_list()
 	# sure we use our version firstly
 	echo $FINDPKG
 	#  Hack for sort by last numbers: sort -n -t . -k 3
-	( ls -1 $PKGREPLBASE/pkgrepl.$PKGVENDOR*$ARCHEXT 2>/dev/null | \
+	( ls -1 $REPLBASE.$PKGVENDOR*$ARCHEXT 2>/dev/null | \
 			( test -n "$ARCHEXT" && grep -v "$PKGVENDOR$ARCHEXT\$" || grep -v "x86_64" ) ; echo $FINDPKG ) | \
 		sort -u | sort -n -t . -k 3 | grep "^$FINDPKG\$" -B1000 | sort -r -n -t . -k 3
 	echo $REPLBASE.$PKGVENDOR$ARCHEXT
@@ -113,6 +113,8 @@ print_replbased_list()
 	internal_repl_list $REPLBASE "" | uniq
 }
 
+PKGREPLBASE=$ETERBUILDDIR/pkgrepl
+
 # TODO: list in  alph. order and use if <= then our version
 print_pkgrepl_list()
 {
@@ -121,7 +123,7 @@ print_pkgrepl_list()
 
 print_grprepl_list()
 {
-	print_replbased_list $PKGREPLBASE/../grprepl/grprepl
+	print_replbased_list $(realpath -f $PKGREPLBASE/../grprepl/grprepl)
 }
 
 

tests/test_repl_find.sh

@@ -49,7 +49,7 @@ check_repl()
 	check $1 "`print_replace $1`" $2
 }
 
-echo "Correct replacement checking for $PKGVENDOR/$DISTRVERSION (target $PKGFORMAT):"
+echo "Replacement files for $PKGVENDOR/$DISTRVERSION (target $PKGFORMAT):"
 check_repl rpm-build-compat rpm-build-altlinux-compat
 check_repl libusb-devel libusb-devel
 
@@ -58,7 +58,7 @@ PKGVENDOR=ubuntu
 PKGFORMAT=deb
 DISTRVERSION=11.04
 
-echo "Correct replacement checking for $PKGVENDOR/$DISTRVERSION (target $PKGFORMAT):"
+echo "Replacement files for $PKGVENDOR/$DISTRVERSION (target $PKGFORMAT):"
 
 print_pkgrepl_list
 
@@ -74,6 +74,8 @@ PKGFORMAT=rpm
 #( ls -1 $PKGREPLBASE/pkgrepl.$VENDOR* | grep -v x86_64 ; echo $FINDPKG ) | sort -u | grep "^$FINDPKG\$" -B1000 | sort -r
 
 echo
-echo "Correct replacement checking for $PKGVENDOR/$DISTRVERSION (target $PKGFORMAT):"
-
+echo "Replacement files for $PKGVENDOR/$DISTRVERSION (target $PKGFORMAT):"
+echo "Package:"
 print_pkgrepl_list
+echo "Group:"
+print_grprepl_list