Skip to content

Commit 59c6db1

Browse files
authored
apt-cyg pull 79 replace awk with gawk
apt-cyg pull 79 replace awk with gawk transcode-open/apt-cyg#79 Fixe issues 78 can't remove or install package cannot open file /etc/setup/setup.rc transcode-open/apt-cyg#78
1 parent e4a5bbf commit 59c6db1

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

apt-cyg

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ function find-workspace {
133133
# default working directory and mirror
134134

135135
# work wherever setup worked last, if possible
136-
cache=$(awk '
136+
cache=$(gawk '
137137
BEGIN {
138138
RS = "\n\\<"
139139
FS = "\n\t"
@@ -145,7 +145,7 @@ function find-workspace {
145145

146146
if [[ "$(uname -m)" == "x86_64" ]]
147147
then
148-
mirror=$(awk '
148+
mirror=$(gawk '
149149
/last-mirror/ {
150150
getline
151151
print $1
@@ -212,7 +212,7 @@ function apt-category {
212212
find-workspace
213213
for pkg in "${pks[@]}"
214214
do
215-
awk '
215+
gawk '
216216
$1 == "@" {
217217
pck = $2
218218
}
@@ -228,10 +228,10 @@ function apt-list {
228228
for pkg in "${pks[@]}"
229229
do
230230
let sbq++ && echo
231-
awk 'NR>1 && $1~pkg && $0=$1' pkg="$pkg" /etc/setup/installed.db
231+
gawk 'NR>1 && $1~pkg && $0=$1' pkg="$pkg" /etc/setup/installed.db
232232
done
233233
let sbq && return
234-
awk 'NR>1 && $0=$1' /etc/setup/installed.db
234+
gawk 'NR>1 && $0=$1' /etc/setup/installed.db
235235
}
236236

237237
function apt-listall {
@@ -241,7 +241,7 @@ function apt-listall {
241241
for pkg in "${pks[@]}"
242242
do
243243
let sbq++ && echo
244-
awk '$1~pkg && $0=$1' RS='\n\n@ ' FS='\n' pkg="$pkg" setup.ini
244+
gawk '$1~pkg && $0=$1' RS='\n\n@ ' FS='\n' pkg="$pkg" setup.ini
245245
done
246246
}
247247

@@ -266,7 +266,7 @@ function apt-show {
266266
for pkg in "${pks[@]}"
267267
do
268268
(( notfirst++ )) && echo
269-
awk '
269+
gawk '
270270
$1 == query {
271271
print
272272
fd++
@@ -284,7 +284,7 @@ function apt-depends {
284284
check-packages
285285
for pkg in "${pks[@]}"
286286
do
287-
awk '
287+
gawk '
288288
@include "join"
289289
$1 == "@" {
290290
apg = $2
@@ -318,7 +318,7 @@ function apt-rdepends {
318318
find-workspace
319319
for pkg in "${pks[@]}"
320320
do
321-
awk '
321+
gawk '
322322
@include "join"
323323
$1 == "@" {
324324
apg = $2
@@ -364,7 +364,7 @@ function download {
364364
pkg=$1
365365
# look for package and save desc file
366366

367-
awk '$1 == pc' RS='\n\n@ ' FS='\n' pc=$pkg setup.ini > desc
367+
gawk '$1 == pc' RS='\n\n@ ' FS='\n' pc=$pkg setup.ini > desc
368368
if [ ! -s desc ]
369369
then
370370
echo Unable to locate package $pkg
@@ -374,7 +374,7 @@ function download {
374374
# download and unpack the bz2 or xz file
375375

376376
# pick the latest version, which comes first
377-
set -- $(awk '$1 == "install:"' desc)
377+
set -- $(gawk '$1 == "install:"' desc)
378378
if (( ! $# ))
379379
then
380380
echo 'Could not find "install" in package description: obsolete package?'
@@ -438,7 +438,7 @@ function apt-searchall {
438438
do
439439
printf -v qs 'text=1&arch=%s&grep=%s' $arch "$pkg"
440440
wget -O matches cygwin.com/cgi-bin2/package-grep.cgi?"$qs"
441-
awk '
441+
gawk '
442442
NR == 1 {next}
443443
mc[$1]++ {next}
444444
/-debuginfo-/ {next}
@@ -471,7 +471,7 @@ function apt-install {
471471
tar -x -C / -f $bn
472472
# update the package database
473473

474-
awk '
474+
gawk '
475475
ins != 1 && pkg < $1 {
476476
print pkg, bz, 0
477477
ins = 1
@@ -480,14 +480,14 @@ function apt-install {
480480
END {
481481
if (ins != 1) print pkg, bz, 0
482482
}
483-
' pkg="$pkg" bz=$bn /etc/setup/installed.db > /tmp/awk.$$
483+
' pkg="$pkg" bz=$bn /etc/setup/installed.db > /tmp/gawk.$$
484484
mv /etc/setup/installed.db /etc/setup/installed.db-save
485-
mv /tmp/awk.$$ /etc/setup/installed.db
485+
mv /tmp/gawk.$$ /etc/setup/installed.db
486486

487487
[ -v nodeps ] && continue
488488
# recursively install required packages
489489

490-
requires=$(awk '$1=="requires", $0=$2' FS=': ' desc)
490+
requires=$(gawk '$1=="requires", $0=$2' FS=': ' desc)
491491
cd ~-
492492
wr=0
493493
if [[ $requires ]]
@@ -526,7 +526,7 @@ function apt-install {
526526
function apt-remove {
527527
check-packages
528528
cd /etc
529-
cygcheck awk bash bunzip2 grep gzip mv sed tar xz > setup/essential.lst
529+
cygcheck gawk bash bunzip2 grep gzip mv sed tar xz > setup/essential.lst
530530
for pkg in "${pks[@]}"
531531
do
532532

@@ -542,7 +542,7 @@ function apt-remove {
542542
exit 1
543543
fi
544544
gzip -dk setup/"$pkg".lst.gz
545-
awk '
545+
gawk '
546546
NR == FNR {
547547
if ($NF) ess[$NF]
548548
next
@@ -570,7 +570,7 @@ function apt-remove {
570570
[ -d /$each ] && rmdir --i /$each
571571
done
572572
rm -f setup/"$pkg".lst.gz postinstall/"$pkg".sh.done
573-
awk -i inplace '$1 != ENVIRON["pkg"]' setup/installed.db
573+
gawk -i inplace '$1 != ENVIRON["pkg"]' setup/installed.db
574574
echo Package $pkg removed
575575
fi
576576
rm setup/"$pkg".lst
@@ -586,7 +586,7 @@ function apt-remove {
586586
function apt-mirror {
587587
if [ "$pks" ]
588588
then
589-
awk -i inplace '
589+
gawk -i inplace '
590590
1
591591
/last-mirror/ {
592592
getline
@@ -595,7 +595,7 @@ function apt-mirror {
595595
' pks="$pks" /etc/setup/setup.rc
596596
echo Mirror set to "$pks".
597597
else
598-
awk '
598+
gawk '
599599
/last-mirror/ {
600600
getline
601601
print $1
@@ -608,7 +608,7 @@ function apt-cache {
608608
if [ "$pks" ]
609609
then
610610
vas=$(cygpath -aw "$pks")
611-
awk -i inplace '
611+
gawk -i inplace '
612612
1
613613
/last-cache/ {
614614
getline
@@ -617,7 +617,7 @@ function apt-cache {
617617
' vas="${vas//\\/\\\\}" /etc/setup/setup.rc
618618
echo Cache set to "$vas".
619619
else
620-
awk '
620+
gawk '
621621
/last-cache/ {
622622
getline
623623
print $1

0 commit comments

Comments
 (0)