server-tools: fixes for install location in /usr/lib/rhizi/{tools/server-tools,rhizi-server}

2 files changed, 4 insertions, 4 deletions

diff --git a/src/local/server-tools/rz.py b/src/local/server-tools/rz.py
index fd989be4..f23628ba 100644
--- a/src/local/server-tools/rz.py
+++ b/src/local/server-tools/rz.py
@@ -21,7 +21,7 @@ import os
 
 # to work both from source dir and from deployment dir
 path = None
-for postfix in [['..', 'bin'], ['..', '..', 'server']]:
+for postfix in [['..', 'bin'], ['..', '..', 'server'], ['..', '..', 'rhizi-server']]:
     candidate = os.path.join(*([os.path.dirname(__file__)] + postfix))
     if os.path.exists(candidate):
         path = candidate
diff --git a/src/local/server-tools/rz_doc.py b/src/local/server-tools/rz_doc.py
index 9fca56fc..fb9eb7a6 100755
--- a/src/local/server-tools/rz_doc.py
+++ b/src/local/server-tools/rz_doc.py
@@ -23,13 +23,13 @@ import os
 import uuid
 import time
 
-import db_controller as dbc
-from model.graph import Topo_Diff
-from neo4j_util import generate_random_id__uuid
 try:
     import rz
 except:
     pass
+import db_controller as dbc
+from model.graph import Topo_Diff
+from neo4j_util import generate_random_id__uuid
 from rz_kernel import RZ_Kernel
 from rz_server import init_config, init_webapp
 from rz_user_db import Fake_User_DB