author | clem <clem> | 2004-09-24 12:39:50 (UTC) |
---|---|---|
committer | clem <clem> | 2004-09-24 12:39:50 (UTC) |
commit | 478b2ead47a09956cadfacb8f469fb2fdee5531c (patch) (unidiff) | |
tree | 2e028e3de22a822d6ae779640e14999030ac3107 | |
parent | 4761d0610715569c7af83dc68ffc90fea4d35690 (diff) | |
download | opie-478b2ead47a09956cadfacb8f469fb2fdee5531c.zip opie-478b2ead47a09956cadfacb8f469fb2fdee5531c.tar.gz opie-478b2ead47a09956cadfacb8f469fb2fdee5531c.tar.bz2 |
Denote the end of the xargs parameters, to avoid "xargs: invalid option -- v"
kind of errors with old xargs.
-rwxr-xr-x | core/launcher/opie-taskbar.prerm | 2 | ||||
-rwxr-xr-x | libopie2/tools/regen.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/launcher/opie-taskbar.prerm b/core/launcher/opie-taskbar.prerm index 664160b..ae02235 100755 --- a/core/launcher/opie-taskbar.prerm +++ b/core/launcher/opie-taskbar.prerm | |||
@@ -1,5 +1,5 @@ | |||
1 | #/bin/sh | 1 | #/bin/sh |
2 | 2 | ||
3 | find /etc -name [SK][0-9][0-9]opie | xargs rm -f | 3 | find /etc -name [SK][0-9][0-9]opie | xargs -- rm -f |
4 | 4 | ||
5 | exit 0 | 5 | exit 0 |
diff --git a/libopie2/tools/regen.py b/libopie2/tools/regen.py index 89385e1..2f53a14 100755 --- a/libopie2/tools/regen.py +++ b/libopie2/tools/regen.py | |||
@@ -1,38 +1,38 @@ | |||
1 | #!/usr/bin/env python | 1 | #!/usr/bin/env python |
2 | 2 | ||
3 | """Regenerate C++ mapping classes""" | 3 | """Regenerate C++ mapping classes""" |
4 | 4 | ||
5 | #---------------------------------------------------------------------------# | 5 | #---------------------------------------------------------------------------# |
6 | # # | 6 | # # |
7 | #---------------------------------------------------------------------------# | 7 | #---------------------------------------------------------------------------# |
8 | 8 | ||
9 | def regenDebugMapper( basename ): | 9 | def regenDebugMapper( basename ): |
10 | """ | 10 | """ |
11 | Debug Mapper - maps ioctl numbers to names, e.g. 0x4x5a -> SIOCGIWNAME | 11 | Debug Mapper - maps ioctl numbers to names, e.g. 0x4x5a -> SIOCGIWNAME |
12 | """ | 12 | """ |
13 | 13 | ||
14 | result = os.popen( 'find /usr/include -name "*.h" |xargs grep -h SIOC|grep 0x' ).readlines() | 14 | result = os.popen( 'find /usr/include -name "*.h" |xargs -- grep -h SIOC|grep 0x' ).readlines() |
15 | 15 | ||
16 | try: | 16 | try: |
17 | tablehfile = file( basename+".h", "w" ) | 17 | tablehfile = file( basename+".h", "w" ) |
18 | except: | 18 | except: |
19 | tablehfile = sys.stdout | 19 | tablehfile = sys.stdout |
20 | 20 | ||
21 | try: | 21 | try: |
22 | tablecfile = file( basename+".cpp", "w" ) | 22 | tablecfile = file( basename+".cpp", "w" ) |
23 | except: | 23 | except: |
24 | tablecfile = sys.stdout | 24 | tablecfile = sys.stdout |
25 | 25 | ||
26 | print >>tablehfile,""" | 26 | print >>tablehfile,""" |
27 | /* | 27 | /* |
28 | * debug value mapper - generated by %s - (C) Michael 'Mickey' Lauer <mickey@vanille.de> | 28 | * debug value mapper - generated by %s - (C) Michael 'Mickey' Lauer <mickey@vanille.de> |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #ifndef DEBUGMAPPER_H | 31 | #ifndef DEBUGMAPPER_H |
32 | #define DEBUGMAPPER_H | 32 | #define DEBUGMAPPER_H |
33 | 33 | ||
34 | #include <qstring.h> | 34 | #include <qstring.h> |
35 | #include <qintdict.h> | 35 | #include <qintdict.h> |
36 | 36 | ||
37 | typedef QIntDict<QString> IntStringMap; | 37 | typedef QIntDict<QString> IntStringMap; |
38 | 38 | ||