diff options
Diffstat (limited to 'abs/core/LinHES-config')
| -rwxr-xr-x | abs/core/LinHES-config/mv_common.py | 8 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/mv_software.py | 2 | ||||
| -rw-r--r-- | abs/core/LinHES-config/mv_supplemental.py | 38 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/systemconfig.py | 20 |
4 files changed, 64 insertions, 4 deletions
diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py index b5939f2..9c5e906 100755 --- a/abs/core/LinHES-config/mv_common.py +++ b/abs/core/LinHES-config/mv_common.py @@ -200,6 +200,10 @@ def pacinstall(pkg): pacinstall("fuppes-svn") elif pkg == "mupen64": pacinstall("mupen64plus-svn") + elif pkg == "dolphinemu": + pacinstall("dolphin-emu") + elif pkg == "webonlinhes": + pacinstall("web-on-linhes") if not pkg_blacklist_check(pkg): if pkg_installed_check(pkg): @@ -223,6 +227,10 @@ def pacremove(pkg): pacremove("fuppes-svn") elif pkg == "mupen64": pacremove("mupen64plus-svn") + elif pkg == "dolphinemu": + pacinstall("dolphin-emu") + elif pkg == "webonlinhes": + pacinstall("web-on-linhes") if not pkg_blacklist_check(pkg): if not pkg_installed_check(pkg): diff --git a/abs/core/LinHES-config/mv_software.py b/abs/core/LinHES-config/mv_software.py index 9948618..af4ed23 100755 --- a/abs/core/LinHES-config/mv_software.py +++ b/abs/core/LinHES-config/mv_software.py @@ -29,7 +29,7 @@ def setup_software(systemconfig, data_config): "mythappletrailers", "mythstream", "mythzoneminder","mythnetvision" ) default_installed=("mythgallery", "mythmovies", "mythmusic") - other_pkg=("miro", "mednafen", "romdb", "xine", "dvdcss", "webmin" , "fuppes", "foldingathome","mupen64","dolphin-emu","web-on-linhes") + other_pkg=("miro", "mednafen", "romdb", "xine", "dvdcss", "webmin" , "fuppes", "foldingathome","mupen64","dolphinemu","webonlinhes") for pkg in default_disabled: pkgname=pkg+postfix diff --git a/abs/core/LinHES-config/mv_supplemental.py b/abs/core/LinHES-config/mv_supplemental.py new file mode 100644 index 0000000..a09cce9 --- /dev/null +++ b/abs/core/LinHES-config/mv_supplemental.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +import logging, mv_common +import os, re + +config_file = "mv_config" + +def windowmanager(systemconfig): + logging.info("____Start of windowmanager setup____") + try: + windowmanager = systemconfig.get("windowmanager") + except: + windowmanager = "default" + return + + if windowmanager == "" : + windowmanager = "default" + try: + style = systemconfig.get("EnhancedWMStyle") + except: + style = "" + + if style == "1" and windowmanager != "default" : + style = "mythvantage" + else: + style = "" + + mv_common.pacinstall("alt_wm") + cmd = '''/usr/LH/bin/set_windowmanager.sh %s %s ''' %(windowmanager,style) + print cmd + mv_common.runcmd(cmd) + logging.info("__End of windowmanager \n") + + +def supplemental(systemconfig): + logging.info("____Start of supplemental config ____") + cmd='''/usr/LH/bin/install_supplemental_service.sh''' + mv_common.runcmd(cmd) + logging.info("__End of supplemental\n")
\ No newline at end of file diff --git a/abs/core/LinHES-config/systemconfig.py b/abs/core/LinHES-config/systemconfig.py index a8bae81..9a9cd11 100755 --- a/abs/core/LinHES-config/systemconfig.py +++ b/abs/core/LinHES-config/systemconfig.py @@ -62,7 +62,7 @@ def main(argv): global systemconfig systemconfig["MVROOT"]=MVROOT restartlcd = False - cmdmodule={"misc":False , "sleep":False , "hostype":False , "hostypec":False , "advanced":False , "audio":False , "network":False , "advancedX":False , "webuser":False , "restartfe":False , "reloadfe":False , "ddns":False , "screensaver":False , "ir":False , "this_is_install":False , "user":False, "software":False, "plugins":False, "smolt":False, "all":False, "dhcp_request":False , "func":False} + cmdmodule={"misc":False , "sleep":False , "hostype":False , "hostypec":False , "advanced":False , "audio":False , "network":False , "advancedX":False , "webuser":False , "restartfe":False , "reloadfe":False , "ddns":False , "screensaver":False , "ir":False , "this_is_install":False , "user":False, "software":False, "plugins":False, "smolt":False, "all":False, "dhcp_request":False , "func":False, "supplemental":False} try: opts, args = getopt.getopt(argv, 'c:hm:d:', ["help","modules" ] ) except getopt.GetoptError, why: @@ -83,7 +83,7 @@ def main(argv): if cmdmodule["this_is_install"] or cmdmodule["hostypec"]: systemconfig["hostypec"] = True - cmdmodule["smolt"] = True + #cmdmodule["smolt"] = True systemconfig["mythip"] = mv_network.setup_MYTH_IP(systemconfig) systemconfig["mythdhcp"] = mv_network.setup_MYTH_DHCP(systemconfig) @@ -154,8 +154,16 @@ def main(argv): else: logging.debug("______Start of Audio Configuration______") if not systemconfig.get("Audiotype") == "tinker": - cmd="%s/bin/soundconfig.sh -t real -i %s -d %s" %(MVROOT,systemconfig.get("Audiotype"),systemconfig["SoundDevice"]) + if cmdmodule["this_is_install"]: + if systemconfig.get("Audiotype") == "OSS": + mv_common.pacinstall("oss") + mv_common.add_service("oss") + + cmd="%s/bin/soundconfig.sh -t real -i %s -d %s" %(MVROOT, + systemconfig.get("Audiotype"), + systemconfig["SoundDevice"]) mv_common.runcmd(cmd) + mv_common.reloadfe(systemconfig.get("dbhost"),restartlcd) else: logging.debug(" Tinker mode(audio), not changing configuration") @@ -234,6 +242,12 @@ def main(argv): cmd = '''dhcpcd -t4 -h' ' -Td %s > /tmp/mvnetwork.dhcpinfo ''' %dhcp_dev mv_common.runcmd(cmd) + if cmdmodule["supplemental"] or cmdmodule["this_is_install"]: + import mv_supplemental + mv_supplemental.windowmanager(systemconfig) + mv_supplemental.supplemental(systemconfig) + + if __name__ == "__main__": |