From fa5050305cbbdcb9c361307f50731b0a5a444636 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sun, 29 Apr 2012 21:32:29 -0500 Subject: LinHES-config: hookup supplemental and correct dolphinemu,webonlinhes so that it doesn't use hyphons. --- abs/core/LinHES-config/PKGBUILD | 13 +++++++---- abs/core/LinHES-config/mv_common.py | 8 +++++++ abs/core/LinHES-config/mv_software.py | 2 +- abs/core/LinHES-config/mv_supplemental.py | 38 +++++++++++++++++++++++++++++++ abs/core/LinHES-config/systemconfig.py | 20 +++++++++++++--- 5 files changed, 72 insertions(+), 9 deletions(-) create mode 100644 abs/core/LinHES-config/mv_supplemental.py diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index cf5a630..9373cef 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.3 -pkgrel=68 +pkgrel=69 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -42,7 +42,8 @@ source=(mv_install.py mv_software.py mv_webuser.py mv_hostype.py - systemconfig.py + mv_supplemental.py + systemconfig.py myth_user_call.py mythvantage.cfg) @@ -89,6 +90,7 @@ build() { install -m 0755 mv_software.py $MVDIR/bin/ install -m 0755 mv_webuser.py $MVDIR/bin/ install -m 0755 mv_hostype.py $MVDIR/bin/ + install -m 0755 mv_supplemental.py $MVDIR/bin/ install -m 0755 systemconfig.py $MVDIR/bin/ install -m 0755 mythvantage.cfg $startdir/pkg/etc/ @@ -126,16 +128,17 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27' '3d1e4a119f38cff0498bf8a67e94e4b3' '71fd2d0d448fc2fcd15415a1beed7109' '5f3259afe031fda189edae41dd1458f0' - 'dc150c1e2c915a55a616d1af5bb1f6de' + '5299131ea195977d97e8582cb142370c' 'b845de3e05c1734cce4b9ac5e8f1baaf' '6801f87992b44118a12b6dfe6ea68127' '5e69839659d65ddda35b8a9982dc29e9' '3afd18517bb765d1680f4fcc8d08c9cc' 'ec6a9961e4d1b53ec1240c5979efff11' 'fe5e31b833cc6707209e9d656b6eb53c' - '76140f4160ebb1790a24f9b51b542a7b' + '9a1728bfd4fb83ca1c46321b57ef0248' '23d0e12b7ca1cc6ea6b993c1d7ff20b9' '0b5b9e5385c7ae77e561812e96ce8161' - '59dd4d49fd92a35f4111aa9b77fa21b6' + 'a1c80cc2b9f77080db02ca54c6057151' + 'd8f80e5686d02555f044363f1ac17d97' '2596460462cf6c889cf8f95485537b20' 'a63ff9ef5250965aeabc74bfa8e43981') 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__": -- cgit v0.12