reorganize in order to make packaging better
This commit is contained in:
13
bin/frappy
13
bin/frappy
@ -22,14 +22,13 @@
|
||||
# *****************************************************************************
|
||||
|
||||
import sys
|
||||
from os.path import join, abspath
|
||||
from os.path import join, abspath, dirname
|
||||
|
||||
sys.path.insert(1, abspath(join(__file__, '../../..')))
|
||||
# above packages: servman, nicos, frappy, history
|
||||
sys.path.insert(0, abspath(join(dirname(__file__), '../..')))
|
||||
|
||||
from servman import run, FrappyManager, NicosManager, SeaManager, UsageError
|
||||
|
||||
from servman.frappy import FrappyManager
|
||||
from servman.nicos import NicosManager
|
||||
from servman.sea import SeaManager
|
||||
from servman import run
|
||||
|
||||
NicosManager()
|
||||
serv = FrappyManager()
|
||||
@ -50,6 +49,6 @@ Usage:
|
||||
try:
|
||||
run(serv, sys.argv[1:])
|
||||
|
||||
except Exception as e:
|
||||
except Exception as e: # TODO: change to UsageError
|
||||
print(repr(e))
|
||||
print(''.join(USAGE))
|
||||
|
14
bin/nicos
14
bin/nicos
@ -21,20 +21,14 @@
|
||||
#
|
||||
# *****************************************************************************
|
||||
|
||||
import os
|
||||
from os.path import join, abspath, expanduser
|
||||
import sys
|
||||
from os.path import join, abspath, dirname
|
||||
|
||||
#nicos_root = os.environ.get('NICOS_ROOT', expanduser('~/nicos'))
|
||||
#pkg_dir = abspath(join(nicos_root, 'nicos_linse'))
|
||||
#sys.path.insert(1, join(pkg_dir, 'common'))
|
||||
# above packages: servman, nicos, frappy, history
|
||||
sys.path.insert(0, abspath(join(dirname(__file__), '../..')))
|
||||
|
||||
sys.path.insert(1, abspath(join(__file__, '../../..')))
|
||||
from servman import run, FrappyManager, NicosManager, SeaManager, UsageError
|
||||
|
||||
from servman.frappy import FrappyManager
|
||||
from servman.nicos import NicosManager
|
||||
from servman.sea import SeaManager
|
||||
from servman import run, UsageError
|
||||
|
||||
serv = NicosManager()
|
||||
FrappyManager()
|
||||
|
@ -24,13 +24,16 @@
|
||||
#
|
||||
# *****************************************************************************
|
||||
|
||||
from __future__ import absolute_import, division, print_function
|
||||
|
||||
import argparse
|
||||
import sys
|
||||
from os import path, environ
|
||||
from os import path, environ, chdir
|
||||
|
||||
root = path.dirname(path.dirname(path.dirname(path.realpath(__file__))))
|
||||
nicos_root = path.join(root, 'nicos')
|
||||
sys.path.insert(0, nicos_root)
|
||||
# above packages:
|
||||
sys.path.insert(1, root)
|
||||
|
||||
sys.path.insert(0, path.dirname(path.dirname(path.dirname(path.realpath(__file__)))))
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('-d', '--daemon', dest='daemon', action='store_true',
|
||||
|
@ -25,13 +25,16 @@
|
||||
# *****************************************************************************
|
||||
|
||||
|
||||
from __future__ import absolute_import, division, print_function
|
||||
|
||||
import argparse
|
||||
import sys
|
||||
from os import path, environ
|
||||
from os import path, environ, chdir
|
||||
|
||||
root = path.dirname(path.dirname(path.dirname(path.realpath(__file__))))
|
||||
nicos_root = path.join(root, 'nicos')
|
||||
sys.path.insert(0, nicos_root)
|
||||
# above packages:
|
||||
sys.path.insert(1, root)
|
||||
|
||||
sys.path.insert(0, path.dirname(path.dirname(path.dirname(path.realpath(__file__)))))
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('-d', '--daemon', dest='daemon', action='store_true',
|
||||
|
@ -24,13 +24,16 @@
|
||||
#
|
||||
# *****************************************************************************
|
||||
|
||||
from __future__ import absolute_import, division, print_function
|
||||
|
||||
import argparse
|
||||
import sys
|
||||
from os import path, environ
|
||||
from os import path, environ, chdir
|
||||
|
||||
root = path.dirname(path.dirname(path.dirname(path.realpath(__file__))))
|
||||
nicos_root = path.join(root, 'nicos')
|
||||
sys.path.insert(0, nicos_root)
|
||||
# above packages:
|
||||
sys.path.insert(1, root)
|
||||
|
||||
sys.path.insert(0, path.dirname(path.dirname(path.dirname(path.realpath(__file__)))))
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('-d', '--daemon', dest='daemon', action='store_true',
|
||||
|
16
bin/sea
16
bin/sea
@ -21,20 +21,14 @@
|
||||
#
|
||||
# *****************************************************************************
|
||||
|
||||
import os
|
||||
from os.path import join, abspath, split, dirname, expanduser
|
||||
import sys
|
||||
from os.path import join, abspath, dirname
|
||||
|
||||
#nicos_root = os.environ.get('NICOS_ROOT', expanduser('~/nicos'))
|
||||
#pkg_dir = abspath(join(nicos_root, 'nicos_linse'))
|
||||
#sys.path.insert(1, join(pkg_dir, 'common'))
|
||||
# above packages: servman, nicos, frappy, history
|
||||
sys.path.insert(0, abspath(join(dirname(__file__), '../..')))
|
||||
|
||||
sys.path.insert(1, abspath(join(__file__, '../../..')))
|
||||
from servman import run, FrappyManager, NicosManager, SeaManager, UsageError
|
||||
|
||||
from servman import run
|
||||
from servman.frappy import FrappyManager
|
||||
from servman.nicos import NicosManager
|
||||
from servman.sea import SeaManager
|
||||
|
||||
NicosManager()
|
||||
FrappyManager()
|
||||
@ -58,7 +52,7 @@ Usage:
|
||||
try:
|
||||
run(serv, sys.argv[1:])
|
||||
|
||||
except Exception as e:
|
||||
except Exception as e: # TODO: change to UsageError
|
||||
raise
|
||||
print(repr(e))
|
||||
print(''.join(USAGE))
|
||||
|
Reference in New Issue
Block a user