14426
|
1 |
diff -up xdg-utils-1.0.2/scripts/xdg-desktop-menu.orig xdg-utils-1.0.2/scripts/xdg-desktop-menu
|
|
2 |
--- xdg-utils-1.0.2/scripts/xdg-desktop-menu.orig 2008-02-13 12:19:40.000000000 +0000
|
|
3 |
+++ xdg-utils-1.0.2/scripts/xdg-desktop-menu 2008-02-13 12:32:47.396025000 +0000
|
|
4 |
@@ -641,7 +641,7 @@ update_desktop_database()
|
|
5 |
fixup_mandriva_categories()
|
|
6 |
{
|
|
7 |
DEBUG 1 "fixup_mandriva_categories $1"
|
|
8 |
- awk '
|
|
9 |
+ nawk '
|
|
10 |
BEGIN {
|
|
11 |
xlat["AudioVideo"]="X-Mandrakelinux-Multimedia;X-MandrivaLinux-Multimedia"
|
|
12 |
xlat["Development"]="X-Mandrakelinux-MoreApplications-Development;X-MandrivaLinux-MoreApplications-Development"
|
|
13 |
@@ -685,7 +685,7 @@ make_lazy_default()
|
|
14 |
local xdg_default_dirs
|
|
15 |
|
|
16 |
DEBUG 1 "make_lazy_default $1/$2"
|
|
17 |
- mimetypes=`awk '
|
|
18 |
+ mimetypes=`nawk '
|
|
19 |
{
|
|
20 |
if (match($0,/MimeType=/)) {
|
|
21 |
split(substr($0,RSTART+9),mimetypes,";")
|
|
22 |
@@ -832,7 +832,7 @@ update_submenu()
|
|
23 |
tmpfile=`mktemp $TMPDIR/tmp.XXXXXXXXXX`
|
|
24 |
orig_desktop_files=
|
|
25 |
if [ -r "$orig_menu_file" ] ; then
|
|
26 |
- awk '
|
|
27 |
+ nawk '
|
|
28 |
# List all files within <Filename> tags
|
|
29 |
BEGIN {
|
|
30 |
RS="<"
|
|
31 |
@@ -926,7 +926,7 @@ BEGIN {
|
|
32 |
tmpfile=`mktemp $TMPDIR/tmp.XXXXXXXXXX`
|
|
33 |
for menu_file in $xdg_dir/*; do
|
|
34 |
if grep 'generated and managed by xdg-desktop-menu' $menu_file > /dev/null 2> /dev/null; then
|
|
35 |
- awk '
|
|
36 |
+ nawk '
|
|
37 |
# List all files within <Directory> tags
|
|
38 |
BEGIN {
|
|
39 |
RS="<"
|
|
40 |
|
|
41 |
diff -up xdg-utils-1.0.2/scripts/xdg-email.orig xdg-utils-1.0.2/scripts/xdg-email
|
|
42 |
--- xdg-utils-1.0.2/scripts/xdg-email.orig 2008-02-13 12:19:40.000000000 +0000
|
|
43 |
+++ xdg-utils-1.0.2/scripts/xdg-email 2008-02-13 12:32:52.343450000 +0000
|
|
44 |
@@ -454,7 +454,7 @@ open_generic()
|
|
45 |
|
|
46 |
url_encode()
|
|
47 |
{
|
|
48 |
-result=$(echo "$1" | $utf8 | awk '
|
|
49 |
+result=$(echo "$1" | $utf8 | nawk '
|
|
50 |
BEGIN {
|
|
51 |
for ( i=1; i<=255; ++i ) ord [ sprintf ("%c", i) "" ] = i + 0
|
|
52 |
e = ""
|
|
53 |
|
|
54 |
diff -up xdg-utils-1.0.2/scripts/xdg-mime.orig xdg-utils-1.0.2/scripts/xdg-mime
|
|
55 |
--- xdg-utils-1.0.2/scripts/xdg-mime.orig 2008-02-13 12:19:40.000000000 +0000
|
|
56 |
+++ xdg-utils-1.0.2/scripts/xdg-mime 2008-02-13 12:32:56.308218000 +0000
|
|
57 |
@@ -508,7 +508,7 @@ make_default_kde()
|
|
58 |
DEBUG 1 "Updating $default_file"
|
|
59 |
mkdir -p "$HOME/.kde/share/config"
|
|
60 |
[ -f $default_file ] || touch $default_file
|
|
61 |
- awk -v application="$1" -v mimetype="$2" '
|
|
62 |
+ nawk -v application="$1" -v mimetype="$2" '
|
|
63 |
BEGIN {
|
|
64 |
header_start="[" mimetype " - "
|
|
65 |
supress=0
|
|
66 |
@@ -894,7 +894,7 @@ mimetypes=
|
|
67 |
if [ -n "$kde_dir" ] ; then
|
|
68 |
DEBUG 2 "KDE3 mimelnk directory found, extracting mimetypes from XML file"
|
|
69 |
|
|
70 |
- mimetypes=`awk < "$filename" '
|
|
71 |
+ mimetypes=`nawk < "$filename" '
|
|
72 |
# Strip XML comments
|
|
73 |
BEGIN {
|
|
74 |
supress=0
|
|
75 |
@@ -923,7 +923,7 @@ BEGIN {
|
|
76 |
}
|
|
77 |
while(1)
|
|
78 |
}
|
|
79 |
-' | awk '
|
|
80 |
+' | nawk '
|
|
81 |
# List MIME types listed in <mime-type> tags
|
|
82 |
BEGIN {
|
|
83 |
RS="<"
|
|
84 |
@@ -954,7 +954,7 @@ case $action in
|
|
85 |
for x in $mimetypes ; do
|
|
86 |
DEBUG 1 "Installing $kde_dir/$x.desktop (KDE 3.x support)"
|
|
87 |
mkdir -p `dirname $kde_dir/$x.desktop`
|
|
88 |
- awk < "$filename" '
|
|
89 |
+ nawk < "$filename" '
|
|
90 |
# Strip XML comments
|
|
91 |
BEGIN {
|
|
92 |
supress=0
|
|
93 |
@@ -983,7 +983,7 @@ BEGIN {
|
|
94 |
}
|
|
95 |
while(1)
|
|
96 |
}
|
|
97 |
-' | awk > $kde_dir/$x.desktop '
|
|
98 |
+' | nawk > $kde_dir/$x.desktop '
|
|
99 |
# Extract mimetype $x from the XML file $filename
|
|
100 |
# Note that bash requires us to escape a single quote as '"'"'
|
|
101 |
BEGIN {
|
|
102 |
|