summaryrefslogtreecommitdiff
authorclem <clem>2004-09-24 12:39:50 (UTC)
committer clem <clem>2004-09-24 12:39:50 (UTC)
commit478b2ead47a09956cadfacb8f469fb2fdee5531c (patch) (side-by-side diff)
tree2e028e3de22a822d6ae779640e14999030ac3107
parent4761d0610715569c7af83dc68ffc90fea4d35690 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xcore/launcher/opie-taskbar.prerm2
-rwxr-xr-xlibopie2/tools/regen.py4
2 files changed, 3 insertions, 3 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 @@
#/bin/sh
-find /etc -name [SK][0-9][0-9]opie | xargs rm -f
+find /etc -name [SK][0-9][0-9]opie | xargs -- rm -f
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 @@
#!/usr/bin/env python
"""Regenerate C++ mapping classes"""
#---------------------------------------------------------------------------#
# #
#---------------------------------------------------------------------------#
def regenDebugMapper( basename ):
"""
Debug Mapper - maps ioctl numbers to names, e.g. 0x4x5a -> SIOCGIWNAME
"""
- result = os.popen( 'find /usr/include -name "*.h" |xargs grep -h SIOC|grep 0x' ).readlines()
+ result = os.popen( 'find /usr/include -name "*.h" |xargs -- grep -h SIOC|grep 0x' ).readlines()
try:
tablehfile = file( basename+".h", "w" )
except:
tablehfile = sys.stdout
try:
tablecfile = file( basename+".cpp", "w" )
except:
tablecfile = sys.stdout
print >>tablehfile,"""
/*
* debug value mapper - generated by %s - (C) Michael 'Mickey' Lauer <mickey@vanille.de>
*/
#ifndef DEBUGMAPPER_H
#define DEBUGMAPPER_H
#include <qstring.h>
#include <qintdict.h>
typedef QIntDict<QString> IntStringMap;
@@ -248,25 +248,25 @@ const QString& OManufacturerDB::lookupExt( const QString& macaddr ) const
#---------------------------------------------------------------------------#
# #
#---------------------------------------------------------------------------#
import sys
import os
import copy
if __name__ == "__main__":
if len( sys.argv ) != 3:
print """
Usage: %s <table> <basename>
Available tables: %s
""" % ( sys.argv[0], [ str(k)[5:] for k in copy.copy( locals() ) if k.startswith( "regen" ) ] )
sys.exit( -1 )
try:
func = locals()["regen%s" % sys.argv[1]]
except KeyError:
print "Table '%s' unknown." % sys.argv[1]
sys.exit( -1 )
else:
func( sys.argv[2] )
- sys.exit( 0 ) \ No newline at end of file
+ sys.exit( 0 )