From e5cd02ca168d06e41912344aa9346530aaeb0fee Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 19 Sep 2013 16:23:29 -0500 Subject: LinHES-config: mv_supplemental.py: don't install fluxbox unless it is choosen. --- abs/core/LinHES-config/PKGBUILD | 5 +++-- abs/core/LinHES-config/mv_supplemental.py | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index e452add..0920a02 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.0 -pkgrel=7 +pkgrel=8 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' @@ -132,6 +132,7 @@ package() { install -o root -g root -D -m 0755 blacklist_pcspkr.conf $pkgdir/etc/modprobe.d/blacklist_pcspkr.conf install -o root -g root -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf } + md5sums=('c832059cd635359d39a2ac3166ff463c' '3f6855b7bb860a44f96a972c2e80f497' 'aaeb581275433649ff74e05da5e61a78' @@ -166,7 +167,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c' '3eec99951c01d1a1abf7ecfeb33f922b' '087a0ef743bc8af915503f8773536ce4' '183a11aa06d60065106472ed9f72cc4a' - 'b2c63ca687a460844fa6f8dabf55f750' + '80685e047993b00161be29e3580f3a40' '299c24c0820fc9c483c820db2595e3cb' 'cf51cb22e23218ae7e9b55cac1ba3a7f' 'e4b61402858058f7575b776d62d5ee89' diff --git a/abs/core/LinHES-config/mv_supplemental.py b/abs/core/LinHES-config/mv_supplemental.py index 2699b3b..50a6c1a 100755 --- a/abs/core/LinHES-config/mv_supplemental.py +++ b/abs/core/LinHES-config/mv_supplemental.py @@ -24,7 +24,12 @@ def windowmanager(systemconfig): else: style = "" - mv_common.pacinstall("alt_wm") + if windowmanager != "fluxbox": + mv_common.pacinstall("e16_theme_settings") + mv_common.pacinstall("wmaker_settings") + else: + mv_common.pacinstall("alt_wm") + cmd = '''/usr/LH/bin/set_windowmanager.sh %s %s ''' %(windowmanager,style) print cmd mv_common.runcmd(cmd) -- cgit v0.12