]>
Commit | Line | Data |
---|---|---|
99a84776 JR |
1 | --- poldek-0.42.2/scripts/vfcompr~ 2020-01-25 22:59:59.000000000 +0100 |
2 | +++ poldek-0.42.2/scripts/vfcompr 2022-09-11 12:57:50.696482611 +0200 | |
3 | @@ -11,7 +11,7 @@ | |
4 | typeset dest=$2 | |
5 | ||
6 | cmd="bzip2 --stdout ${src}" | |
7 | - if echo ${dest} | egrep ".gz" >/dev/null; then | |
8 | + if echo ${dest} | grep -E ".gz" >/dev/null; then | |
9 | cmd="gzip -9nf --stdout ${src}" | |
10 | fi | |
11 | echo "$cmd > $dest" | |
12 | @@ -34,7 +34,7 @@ | |
13 | fi | |
14 | ||
15 | cmd="bunzip2 --keep --stdout ${src}" | |
16 | - if echo ${src} | egrep ".gz" >/dev/null; then | |
17 | + if echo ${src} | grep -E ".gz" >/dev/null; then | |
18 | cmd="gunzip --stdout ${src}" | |
19 | fi | |
20 | rm -f "$dest" | |
21 | --- poldek-0.42.2/Makefile.extra~ 2020-01-25 22:59:59.000000000 +0100 | |
22 | +++ poldek-0.42.2/Makefile.extra 2022-09-11 12:59:01.885518021 +0200 | |
23 | @@ -72,7 +72,7 @@ | |
24 | ||
25 | POTFILES_in: | |
26 | -rm -f poldek-git* | |
27 | - -find . -type f -name \*.c | egrep -v '(poldek-.*/|Cellar/|intl/|trurlib/|tndb/|python/|tests/|conf_sections.c)' | sed 's|^\./||' | LC_ALL=C sort > po/POTFILES.in | |
28 | + -find . -type f -name \*.c | grep -E -v '(poldek-.*/|Cellar/|intl/|trurlib/|tndb/|python/|tests/|conf_sections.c)' | sed 's|^\./||' | LC_ALL=C sort > po/POTFILES.in | |
29 | ||
30 | misarch: mclean | |
31 | $(MAKE) -C . backup cparch=1 backupdir=/z | |
32 | --- poldek-0.42.2/tests/sh/03-up-loop~ 2020-04-09 12:53:57.000000000 +0200 | |
33 | +++ poldek-0.42.2/tests/sh/03-up-loop 2022-09-11 13:00:01.988044987 +0200 | |
34 | @@ -15,10 +15,10 @@ | |
35 | ||
36 | load() { | |
37 | $POLDEK_UP -q --skip-installed -Osource="test,type=pndir $REPOURL" -n test \ | |
38 | - --cmd 'desc -al *' | egrep -v '^Path:' > $TMPDIR/local-dump | |
39 | + --cmd 'desc -al *' | grep -E -v '^Path:' > $TMPDIR/local-dump | |
40 | ||
41 | $POLDEK_NOCONF -q --skip-installed --st pndir -s $REPO \ | |
42 | - --cmd 'desc -al *' | egrep -v '^Path:' > $TMPDIR/remote-dump | |
43 | + --cmd 'desc -al *' | grep -E -v '^Path:' > $TMPDIR/remote-dump | |
44 | ||
45 | #less $TMPDIR/remote-dump | |
46 | #ls -l $TMPDIR/remote-dump $TMPDIR/local-dump | |
47 | --- poldek-0.42.2/tests/sh/lib/setup~ 2020-03-27 08:50:43.000000000 +0100 | |
48 | +++ poldek-0.42.2/tests/sh/lib/setup 2022-09-11 13:00:26.557717267 +0200 | |
49 | @@ -56,7 +56,7 @@ | |
50 | while test $# -gt 0 ; do | |
51 | case "${1}" in | |
52 | -l) | |
53 | - egrep -B 1 ^test $0 | sed 's|()||g;s|{||g'; exit; shift ;; | |
54 | + grep -E -B 1 ^test $0 | sed 's|()||g;s|{||g'; exit; shift ;; | |
55 | ||
56 | --source-repo) | |
57 | shift; SOURCE_REPO="${1}"; shift ;; | |
58 | --- poldek-0.42.2/tests/sh/lib/solver-setup~ 2020-03-31 11:46:23.000000000 +0200 | |
59 | +++ poldek-0.42.2/tests/sh/lib/solver-setup 2022-09-11 13:00:42.930832785 +0200 | |
60 | @@ -8,7 +8,7 @@ | |
61 | [ $# -gt 0 ] && version="$1"; | |
62 | #echo "v $version" | |
63 | if [ -n "$version" ]; then | |
64 | - if echo "$version" | egrep -qv -- '^-'; then | |
65 | + if echo "$version" | grep -E -qv -- '^-'; then | |
66 | shift | |
67 | else | |
68 | version="1-1" | |
69 | @@ -85,17 +85,17 @@ | |
70 | fi | |
71 | ||
72 | # run again to check installation results | |
73 | - typeset out=$($POLDEK_INSTALL $cmd --parsable-tr-summary | egrep "^%[IDR]") | |
74 | + typeset out=$($POLDEK_INSTALL $cmd --parsable-tr-summary | grep -E "^%[IDR]") | |
75 | if [ -n "$expected" ]; then | |
76 | - typeset n_all=$(echo $out | sed 's|%|\n%|g' | egrep '^%[ID]' | wc -l) | |
77 | - typeset n=$(echo $out | sed 's|%|\n%|g' | egrep "^%[ID] ($regexp)" | wc -l) | |
78 | + typeset n_all=$(echo $out | sed 's|%|\n%|g' | grep -E '^%[ID]' | wc -l) | |
79 | + typeset n=$(echo $out | sed 's|%|\n%|g' | grep -E "^%[ID] ($regexp)" | wc -l) | |
80 | assertEquals "unexpected ($n_all) number of packages (expected $n)" "$n_all" "$n" | |
81 | assertEquals "not all or non expected packages installed (expected $expected)" "$n" "$n_expected" | |
82 | fi | |
83 | ||
84 | if [ -n "$rm_expected" ]; then | |
85 | - typeset n_all=$(echo $out | sed 's|%|\n%|g' | egrep '^%R' | wc -l) | |
86 | - typeset n=$(echo $out | sed 's|%|\n%|g' | egrep "^%R ($rm_regexp)" | wc -l) | |
87 | + typeset n_all=$(echo $out | sed 's|%|\n%|g' | grep -E '^%R' | wc -l) | |
88 | + typeset n=$(echo $out | sed 's|%|\n%|g' | grep -E "^%R ($rm_regexp)" | wc -l) | |
89 | assertEquals "unexpected ($n_all) number of packages removed (expected $n)" "$n_all" "$n" | |
90 | assertEquals "not all or non expected packages removed (expected $rm_expected)" "$n" "$rm_n_expected" | |
91 | fi | |
92 | @@ -127,12 +127,12 @@ | |
93 | $POLDEK_UNINSTALL $cmd --test | |
94 | fi | |
95 | ||
96 | - typeset out=$($POLDEK_UNINSTALL $cmd --parsable-tr-summary | egrep "^%[DR]") | |
97 | + typeset out=$($POLDEK_UNINSTALL $cmd --parsable-tr-summary | grep -E "^%[DR]") | |
98 | [ $? -eq 0 ] || fail "$POLDEK_INSTALL $cmd failed" | |
99 | ||
100 | if [ -n "$expected" ]; then | |
101 | - typeset n_all=$(echo $out | sed 's|%|\n%|g' | egrep '^%[RD]' | wc -l) | |
102 | - typeset n=$(echo $out | sed 's|%|\n%|g' | egrep "^%[RD] ($regexp)" | wc -l) | |
103 | + typeset n_all=$(echo $out | sed 's|%|\n%|g' | grep -E '^%[RD]' | wc -l) | |
104 | + typeset n=$(echo $out | sed 's|%|\n%|g' | grep -E "^%[RD] ($regexp)" | wc -l) | |
105 | assertEquals "unexpected ($n_all) number of packages (expected $n)" "$n_all" "$n" | |
106 | assertEquals "not all or non expected packages uninstalled (expected $expected)" "$n" "$n_expected" | |
107 | fi |