← Back to branch summary

~jstys-z/helioviewer.org/client5

« back to all changes in this revision

Viewing changes to install/install.py

  • Committer: Keith Hughitt
  • Date: 2011-09-12 19:44:23 UTC
  • mfrom: (402.1.731 hv)
  • Revision ID: keith.hughitt@nasa.gov-20110912194423-pd3obtn088k2k18g
Fixed bug #616377: Add option to generate a link to load a specific movie into Helioviewer.org

Show diffs side-by-side

added added

removed removed

Lines of Context:
install/install.py
3
3
"""
4
4
Helioviewer Database Installation Tool
5
5
 
6
 
Last Updated: 2011/05/01
 
6
Last Updated: 2011/07/27
7
7
 
8
8
TODO 01/17/2010:
9
9
* Let user specify dbname
19
19
    
20
20
    # Installation method
21
21
    if options.textinstall:
22
 
        from org.helioviewer.HelioviewerConsoleInstaller import loadTextInstaller
23
 
        loadTextInstaller(options)
 
22
        import helioviewer.installer.console
 
23
        helioviewer.installer.console.install(options)
24
24
    elif options.update:
25
 
        from org.helioviewer.HelioviewerConsoleInstaller import loadUpdater
26
 
        loadUpdater(options)
 
25
        import helioviewer.installer.console
 
26
        helioviewer.installer.console.update(options)
27
27
    else:
 
28
        # Look for Qt support
28
29
        try:
29
30
            import PyQt4
30
31
        except:
31
 
            from org.helioviewer.HelioviewerConsoleInstaller import loadTextInstaller
32
 
            loadTextInstaller(options)
 
32
            import helioviewer.installer.console
 
33
            helioviewer.installer.console.install(options)
33
34
        else:
34
 
            from org.helioviewer.HelioviewerInstallWizard import loadGUIInstaller
35
 
            loadGUIInstaller(argv)
 
35
            import helioviewer.installer.gui
 
36
            helioviewer.installer.gui.install(options)
36
37
        
37
38
def get_arguments():
38
39
    ''' Gets command-line arguments and handles validation '''
61
62
    except:
62
63
        sys.exit(2)
63
64
        
64
 
    # update-mode
 
65
    # Updates only deal with processing new images
65
66
    if options.update:
66
67
        if len(args) == 0:
67
68
            print("No files to process. Exiting installer.")
72
73
 
73
74
if __name__ == '__main__':
74
75
        main(sys.argv)
75