File rpm-utils-0.9.18-fix-bashisms.patch of Package rpm-utils

Overview Repositories Revisions Requests Users Attributes Meta

File rpm-utils-0.9.18-fix-bashisms.patch of Package rpm-utils

diff -Ndurp rpm-utils-0.9.18/optimize_package_list rpm-utils-0.9.18-fix-bashisms/optimize_package_list
--- rpm-utils-0.9.18/optimize_package_list	2014-01-17 16:07:05.000000000 +0200
+++ rpm-utils-0.9.18-fix-bashisms/optimize_package_list	2014-10-19 21:19:28.744676414 +0300
@@ -48,7 +48,7 @@ sort -u -o n n
 rpmquery -a --qf '[%{REQUIRENAME}\t%{NAME}\n]' > Rn-all
 sort -k1,1 -k2,2 -u -o Rn-all Rn-all
 sort -k2,2 -o Rn-all-k2 Rn-all
-join -t$'\t' -1 1 -2 2 -o '2.1 2.2' n Rn-all-k2 > Rn
+join -t'	' -1 1 -2 2 -o '2.1 2.2' n Rn-all-k2 > Rn
 sort -k1,1 -k2,2 -u -o Rn Rn
 
 # make list of provides
@@ -56,7 +56,7 @@ rpmquery -a --qf '[%{PROVIDENAME}\t%{NAM
 sed -i '/^[^[:space:]]*[[:space:]][^[:space:]]*[[:space:]]/d' Pn-all
 sort -k1,1 -k2,2 -u -o Pn-all Pn-all
 sort -k2,2 -o Pn-all-k2 Pn-all
-join -t$'\t' -1 1 -2 2 -o '2.1 2.2' n Pn-all-k2 > Pn
+join -t'	' -1 1 -2 2 -o '2.1 2.2' n Pn-all-k2 > Pn
 sort -k1,1 -k2,2 -u -o Pn Pn
 
 # add indirect requirements and provides
@@ -70,10 +70,10 @@ while :; do
 	fi
 	mv n-closure+ n-closure
 
-	join -t$'\t' -1 1 -2 2 -o '2.1 2.2' n-closure Rn-all-k2 > Rn
+	join -t'	' -1 1 -2 2 -o '2.1 2.2' n-closure Rn-all-k2 > Rn
 	sort -k1,1 -k2,2 -u -o Rn Rn
 
-	join -t$'\t' -1 1 -2 2 -o '2.1 2.2' n-closure Pn-all-k2 > Pn
+	join -t'	' -1 1 -2 2 -o '2.1 2.2' n-closure Pn-all-k2 > Pn
 	sort -k1,1 -k2,2 -u -o Pn Pn
 done
 rm n-closure+ n-closure Rn-all Rn-all-k2 Pn-all Pn-all-k2
@@ -107,20 +107,20 @@ rm nRn
 # prefix packages from the original set with '*'
 sed 's/^.*/&\t*&/' <n >n.map
 for f in nn-real nn-virt; do
-	join -t$'\t' -j1 -o2.2,1.2 $f n.map >Nn
-	join -t$'\t' -j1 -v1 -o1.1,1.2 $f n.map >>Nn
-	sort -k2,2 -o Nn{,}
-	join -t$'\t' -12 -21 -o1.1,2.2 Nn n.map >$f
-	join -t$'\t' -12 -21 -v1 -o1.1,1.2 Nn n.map >>$f
+	join -t'	' -j1 -o2.2,1.2 $f n.map >Nn
+	join -t'	' -j1 -v1 -o1.1,1.2 $f n.map >>Nn
+	sort -k2,2 -o Nn Nn
+	join -t'	' -12 -21 -o1.1,2.2 Nn n.map >$f
+	join -t'	' -12 -21 -v1 -o1.1,1.2 Nn n.map >>$f
 	rm Nn
-	sort -u -o $f{,}
+	sort -u -o $f $f
 done
 
 comm -23 nn-virt nn-real >nn-virt-only
 mv -f nn-virt-only nn-virt
 # nn-real:	vim-console	vim-common
 # nn-virt:	vim-common	vim-console
-join -t$'\t' -v1 -o1.2,1.1 nn-virt /dev/null |sort -u >reverse-nn-virt
+join -t'	' -v1 -o1.2,1.1 nn-virt /dev/null | sort -u >reverse-nn-virt
 comm -12 reverse-nn-virt nn-real >nn-real-virt-loop
 rm reverse-nn-virt
 
@@ -130,7 +130,7 @@ sed -i '/^[^*[:space:]]\+[[:space:]]\+\*
 if [ -s nn-real-virt-loop ]; then
 	echo "$PROG: simple RV-loop (first package takes precedence):"
 	sed -e 's/	/ <-> /g' <nn-real-virt-loop
-	join -t$'\t' -v1 -o1.2,1.1 nn-real-virt-loop /dev/null |sort -u >nn-virt-bad
+	join -t'	' -v1 -o1.2,1.1 nn-real-virt-loop /dev/null | sort -u >nn-virt-bad
 	comm -23 nn-virt nn-virt-bad >nn-virt-good
 	rm nn-virt-bad
 	mv -f nn-virt-good nn-virt
diff -Ndurp rpm-utils-0.9.18/rebuild_packages rpm-utils-0.9.18-fix-bashisms/rebuild_packages
--- rpm-utils-0.9.18/rebuild_packages	2014-01-17 16:07:05.000000000 +0200
+++ rpm-utils-0.9.18-fix-bashisms/rebuild_packages	2014-10-19 21:23:11.514661343 +0300
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 exec </dev/null

Places

File rpm-utils-0.9.18-fix-bashisms.patch of Package rpm-utils

Places