~jstys-z/helioviewer.org/client5

« back to all changes in this revision

Viewing changes to install/install.py

  • Committer: Keith Hughitt
  • Date: 2012-04-23 19:07:32 UTC
  • mto: This revision was merged to the branch mainline in revision 732.
  • Revision ID: keith.hughitt@nasa.gov-20120423190732-40hc0ond3dhvo9ek
Reorganized installer and downloader code

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
"""
4
4
Helioviewer Database Installation Tool
5
5
 
6
 
Last Updated: 2012/01/19
 
6
Last Updated: 2012/04/23
7
7
 
8
8
TODO 01/17/2010:
9
9
* Let user specify dbname
11
11
* Udpate graphical installer to reflect changes to text installer
12
12
"""
13
13
import sys
14
 
from shared.util import init_logger
 
14
from helioviewer import init_logger
15
15
 
16
16
def main():
17
17
    '''Main application access point'''
19
19
 
20
20
    try:
21
21
        import PyQt4
22
 
        import installer.gui
23
 
        installer.gui.install()
 
22
        import helioviewer.installer.gui
 
23
        helioviewer.installer.gui.install()
24
24
    except Exception as e:
25
 
        from installer.console import HelioviewerConsoleInstaller
 
25
        from helioviewer.installer.console import HelioviewerConsoleInstaller
26
26
        app = HelioviewerConsoleInstaller()
27
27
 
28
28
if __name__ == '__main__':