- added startup desktop file for fusion-desktop-effects

- make setup.py better
- added --replace when launching compiz fusion

1 files changed, 18 insertions, 17 deletions

diff --git a/setup.py b/setup.py
index 66320e7..4de368e 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import sys, getopt
+import sys
 from distutils.core import setup
 from distutils.command.build import build as _build
 
@@ -9,27 +9,28 @@ pyscripts = ["fusion-desktop-effects"]
 scripts = ["compiz-fusion-gtk"]
 
 
-def getindex(l,var):
+def simple_getopt(l,var):
     idx = 0
     for i in l:
+        v = "%s=" % var
+        if v in i:
+           return (var,i.replace(v,''),idx)
         if i == var:
-           return idx
-        else: 
+           return (var,l[idx+1],idx)
+        else:
            idx += 1
-    return 0
+    return (None,None,idx)
 
 if len(sys.argv) > 2:
-   (opts,args) = getopt.getopt(sys.argv[2:],"","prefix=")
-   for o,v in opts:
-       if o == "--prefix":
-          prefix = v
-          if sys.argv[1] == "build":
-             if "%s=%s" % (o,v) in sys.argv:
-                sys.argv.remove("%s=%s" % (o,v))
-             else:
-                i = getindex(sys.argv,o)
-                sys.argv.pop(i)
-                sys.argv.pop(i)
+   o,v,i = simple_getopt(sys.argv,'--prefix')
+   if v:
+      prefix = v
+      if sys.argv[1] == "build":
+         if "%s=%s" % (o,v) in sys.argv:
+            sys.argv.remove("%s=%s" % (o,v))
+         else:
+            sys.argv.pop(i)
+            sys.argv.pop(i)
 
 datadir="%s/share/fusion-desktop-effects/" % prefix
 
@@ -56,7 +57,7 @@ setup (
         license          = "GPL",
         data_files       = [
                             (datadir,['images/cf_logo.png']),
-                            ('%s/share/applications' % prefix, ['compiz-fusion-gtk.desktop'])
+                            ('%s/share/applications' % prefix, ['compiz-fusion-gtk.desktop','fusion-desktop-effects.desktop'])
                            ],
         packages         = [],
         scripts          = scripts + pyscripts,