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