added explicit install target

[sfa.git] / geni / gimport.py

diff --git a/geni/gimport.py b/geni/gimport.py
index 02865e0..78e9642 100755 (executable)
--- a/geni/gimport.py
+++ b/geni/gimport.py
@@ -1,4 +1,4 @@
-#!/bin/bash/python
+#!/usr/bin/python
 #
 #
 ##
@@ -55,7 +55,7 @@ if not level1_auth or level1_auth in ['']:
 
 keyconvert = 'keyconvert'
 loaded = False
-default_path = "/usr/shre/keyconvert/" + keyconvert
+default_path = "/usr/share/keyconvert/" + keyconvert
 cwd = os.path.dirname(os.path.abspath(__file__))
 alt_path = os.sep.join(cwd.split(os.sep)[:-1] + ['keyconvert', 'keyconvert'])
 geni_path = config.GENI_BASE_DIR + os.sep + "keyconvert/keyconvert"
@@ -64,13 +64,11 @@ for path in files:
     if os.path.isfile(path):
         keyconvert_fn = path
         loaded = True
+        break
 
 if not loaded:
     raise Exception, "Could not find config in " + ", ".join(files)        
 
-keyconvert_fn = config.GENI_BASE_DIR + os.sep + "keyconvert/keyconvert"
-alt_keyconvert_fn
-
 def un_unicode(str):
    if isinstance(str, unicode):
        return str.encode("ascii", "ignore")