Revise some awk statements

This commit is contained in:
Steven Penny 2014-05-24 14:56:57 -05:00
parent 73512e40cb
commit 6a62641d94
1 changed files with 12 additions and 22 deletions

34
apt-cyg
View File

@ -347,13 +347,13 @@ case "$command" in
cd /tmp cd /tmp
wget -O matches cygwin.com/cgi-bin2/package-grep.cgi?"$qs" wget -O matches cygwin.com/cgi-bin2/package-grep.cgi?"$qs"
awk ' awk '
NR > 1 && NR > 1 &&
! /-debuginfo-/ && ! /-debuginfo-/ &&
! /-devel-/ && ! /-devel-/ &&
! /-doc-/ && ! /-doc-/ &&
! /-src\t$/ && ! /-src\t$/ &&
! mc[$2]++ && ! mc[$2]++ &&
$0=$2 $0 = $2
' FS=/ matches ' FS=/ matches
done done
;; ;;
@ -375,18 +375,8 @@ case "$command" in
# look for package and save desc file # look for package and save desc file
mkdir -p release/"$pkg" mkdir -p release/"$pkg"
awk ' awk '$1 == pc' RS='\n\n@ ' FS='\n' pc=$pkg setup.ini > release/$pkg/desc
$1 == package { if [ ! -s release/$pkg/desc ]
desc = $0
px++
}
END {
if (px == 1 && desc) print desc
else print "Package not found"
}
' RS='\n\n@ ' FS='\n' package="$pkg" setup.ini > release/"$pkg"/desc
desc=$(<release/"$pkg"/desc)
if [[ $desc = 'Package not found' ]]
then then
echo Package $pkg not found or ambiguous name, exiting echo Package $pkg not found or ambiguous name, exiting
rm -r release/"$pkg" rm -r release/"$pkg"
@ -404,7 +394,7 @@ case "$command" in
exit 1 exit 1
fi fi
file=`basename $install` file=$(basename $install)
cd release/"$pkg" cd release/"$pkg"
wget -nc $mirror/$install wget -nc $mirror/$install
@ -426,12 +416,12 @@ case "$command" in
awk ' awk '
ins != 1 && pkg < $1 { ins != 1 && pkg < $1 {
printf "%s %s 0\n", pkg, bz print pkg, bz, 0
ins=1 ins = 1
} }
1 1
END { END {
if (ins != 1) printf "%s %s 0\n", pkg, bz if (ins != 1) print pkg, bz, 0
} }
' pkg="$pkg" bz=$file /etc/setup/installed.db > /tmp/awk.$$ ' pkg="$pkg" bz=$file /etc/setup/installed.db > /tmp/awk.$$
mv /etc/setup/installed.db /etc/setup/installed.db-save mv /etc/setup/installed.db /etc/setup/installed.db-save