From 89f03c5d15a1dcf5d0221040114ee224ed799c27 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 17 May 2015 19:45:53 +0200 Subject: [PATCH] mambabase: autodetect NVIDIA proprietary driver and add chromium-pepper-flash --- mambabase/mambabase.kmdr | 389 +++++++++++++++++++-------------------- mambabase/mambabase.sh | 25 +-- 2 files changed, 206 insertions(+), 208 deletions(-) diff --git a/mambabase/mambabase.kmdr b/mambabase/mambabase.kmdr index 3c07cb4..83093ec 100755 --- a/mambabase/mambabase.kmdr +++ b/mambabase/mambabase.kmdr @@ -841,85 +841,6 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing WordBreak|AlignVCenter - - - checkform3 - - - - 0 - 370 - 32 - 32 - - - - - @BackBox.setChecked(true) -@NextBox.setChecked(true) -rpm -q xorg-drv-video-nvidia && { - dcop @dcopid KommanderIf setEnabled inst_nvidia false -} - -rpm -q xorg-drv-video-nvidia_304 && { - dcop @dcopid KommanderIf setEnabled inst_nvidia_legacy false -} - -rpm -q xorg-drv-video-fglrx && { - dcop @dcopid KommanderIf setEnabled inst_fglrx false -} - -rpm -q xorg-drv-video-fglrx && { - dcop @dcopid KommanderIf setEnabled inst_fglrx_legacy false -} - -openmamba-netsrpms -c flashplugin > /dev/null -if [ $? -eq 0 ]; then - dcop @dcopid KommanderIf setEnabled inst_flash false -fi - -openmamba-netsrpms -c msttcorefonts > /dev/null -if [ $? -eq 0 ]; then - dcop @dcopid KommanderIf setEnabled inst_msttcf false -fi - -openmamba-netsrpms -c win32codecs > /dev/null -if [ $? -eq 0 ]; then - dcop @dcopid KommanderIf setEnabled inst_codecs false -fi - -openmamba-netsrpms -c sun-java7 > /dev/null -if [ $? -eq 0 ]; then - dcop @dcopid KommanderIf setEnabled inst_java false -fi - -openmamba-netsrpms -c skype > /dev/null -if [ $? -eq 0 ]; then - dcop @dcopid KommanderIf setEnabled inst_skype false -fi - -openmamba-netsrpms -c broadcom-sta > /dev/null -if [ $? -eq 0 ]; then - dcop @dcopid KommanderIf setEnabled inst_broadcom_sta false -fi - -openmamba-netsrpms -c b43-firmware > /dev/null -if [ $? -eq 0 ]; then - dcop @dcopid KommanderIf setEnabled inst_b43 false -fi - -openmamba-netsrpms -c spotify > /dev/null -if [ $? -eq 0 ]; then - dcop @dcopid KommanderIf setEnabled inst_spotify false -fi - -openmamba-netsrpms -c virtualbox-extension-pack > /dev/null -if [ $? -eq 0 ]; then - dcop @dcopid KommanderIf setEnabled inst_virtualbox false -fi - - - GroupBox2_2_2 @@ -950,7 +871,7 @@ fi - inst_nvidia_legacy + inst_nvidia true @@ -958,13 +879,16 @@ fi 20 - 40 + 20 510 20 - NVIDIA propri&etary video driver (legacy) from openmamba.org + NVIDIA proprietary video &driver (autodetected) from openmamba.org + + + false @@ -981,6 +905,32 @@ fi true + + + 20 + 40 + 510 + 20 + + + + AMD/ATI propri&etary video driver from openmamba.org + + + + + + + + + + + + inst_fglrx_legacy + + + true + 20 @@ -990,7 +940,59 @@ fi - AMD/ATI proprietary video driver from openmamba.org + AMD/ATI proprietary video driver (le&gacy) from openmamba.org + + + + + + + + + + + + inst_broadcom_sta + + + true + + + + 20 + 80 + 510 + 20 + + + + Broadcom-sta proprietary wireless driver from openmamba.org + + + + + + + + + + + + inst_b43 + + + true + + + + 20 + 100 + 510 + 20 + + + + &Broadcom B43 proprietary firmware from openwrt.org @@ -1107,6 +1109,28 @@ fi + + + inst_codecs + + + true + + + + 20 + 180 + 500 + 20 + + + + &Win32 codecs from mplayerhq.hu + + + false + + inst_msttcf @@ -1143,7 +1167,7 @@ fi 20 - 140 + 120 510 20 @@ -1157,7 +1181,7 @@ fi - inst_codecs + inst_pepperflash true @@ -1165,125 +1189,18 @@ fi 20 - 180 - 500 + 139 + 510 20 - &Win32 codecs from mplayerhq.hu + Pepper-Flas&h plugin for chromium from google.com false - - - inst_nvidia - - - true - - - - 20 - 20 - 510 - 20 - - - - NVIDIA proprietary video &driver from openmamba.org - - - false - - - - - - - - - - - - inst_fglrx_legacy - - - true - - - - 20 - 80 - 510 - 20 - - - - AMD/ATI proprietary video driver (le&gacy) from openmamba.org - - - - - - - - - - - - inst_b43 - - - true - - - - 20 - 120 - 510 - 20 - - - - &Broadcom B43 proprietary firmware from openwrt.org - - - - - - - - - - - - inst_broadcom_sta - - - true - - - - 20 - 100 - 510 - 20 - - - - Broadcom-sta proprietary wireless driver from openmamba.org - - - - - - - - - @@ -1305,6 +1222,86 @@ WARNING: you'll have to accept a license agreement for most selected packages.WordBreak|AlignTop + + + checkform3 + + + + 0 + 370 + 32 + 32 + + + + + @BackBox.setChecked(true) +@NextBox.setChecked(true) +rpm -q xorg-drv-video-nvidia || rpm -q xorg-drv-video-nvidia_304 || rpm -q xorg-drv-video-nvidia_340 && { + dcop @dcopid KommanderIf setEnabled inst_nvidia false +} + +rpm -q xorg-drv-video-fglrx && { + dcop @dcopid KommanderIf setEnabled inst_fglrx false +} + +rpm -q xorg-drv-video-fglrx && { + dcop @dcopid KommanderIf setEnabled inst_fglrx_legacy false +} + +openmamba-netsrpms -c flashplugin > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_flash false +fi + +openmamba-netsrpms -c chromium-pepper-flash > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_pepperflash false +fi + +openmamba-netsrpms -c msttcorefonts > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_msttcf false +fi + +openmamba-netsrpms -c win32codecs > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_codecs false +fi + +openmamba-netsrpms -c sun-java7 > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_java false +fi + +openmamba-netsrpms -c skype > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_skype false +fi + +openmamba-netsrpms -c broadcom-sta > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_broadcom_sta false +fi + +openmamba-netsrpms -c b43-firmware > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_b43 false +fi + +openmamba-netsrpms -c spotify > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_spotify false +fi + +openmamba-netsrpms -c virtualbox-extension-pack > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_virtualbox false +fi + + + @@ -1478,11 +1475,11 @@ INSTALL_VIRTUALIZATION='@inst_virtualization.checked()' INSTALL_SERVER='@inst_server.checked()' INSTALL_DEVEL='@inst_devel.checked()' INSTALL_FLASH='@inst_flash.checked()' +INSTALL_PEPPERFLASH='@inst_pepperflash.checked()' INSTALL_CODECS='@inst_codecs.checked()' INSTALL_MSTTCF='@inst_msttcf.checked()' INSTALL_SKYPE='@inst_skype.checked()' INSTALL_NVIDIA='@inst_nvidia.checked()' -INSTALL_NVIDIA_LEGACY='@inst_nvidia_legacy.checked()' INSTALL_FGLRX='@inst_fglrx.checked()' INSTALL_FGLRX_LEGACY='@inst_fglrx_legacy.checked()' INSTALL_BROADCOM_STA='@inst_broadcom_sta.checked()' diff --git a/mambabase/mambabase.sh b/mambabase/mambabase.sh index 76453d7..8fa8bc5 100644 --- a/mambabase/mambabase.sh +++ b/mambabase/mambabase.sh @@ -1,5 +1,5 @@ # openmamba post installation script -# Copyright (c) 2007-2014 by Silvan Calarco +# Copyright (c) 2007-2015 by Silvan Calarco # # Released under the terms of the GNU GPLv3 License @@ -77,12 +77,12 @@ TOTAL_PROGRESS=10 [ "$INSTALL_SERVER" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 15` [ "$INSTALL_DEVEL" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 15` [ "$INSTALL_FLASH" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` +[ "$INSTALL_PEPPERFLASH" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_SKYPE" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_CODECS" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_MSTTCF" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_JAVA" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_NVIDIA" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` -[ "$INSTALL_NVIDIA_LEGACY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_FGLRX" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_FGLRX_LEGACY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_BROADCOM_STA" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` @@ -174,15 +174,10 @@ if [ "$INSTALL_DEVEL" = "1" ]; then fi if [ "$INSTALL_NVIDIA" = "1" ]; then - echo $"Installing NVIDIA proprietary video driver packages" - dcop_write $"Installing/updating NVIDIA proprietary video driver packages..." 10 - rpm -q --whatprovides xorg-drv-video-nvidia >/dev/null || apt_get_parsed install -y xorg-drv-video-nvidia -fi - -if [ "$INSTALL_NVIDIA_LEGACY" = "1" ]; then - echo $"Installing NVIDIA proprietary (legacy) video driver packages" - dcop_write $"Installing/updating NVIDIA proprietary (legacy) video driver packages..." 10 - rpm -q --whatprovides xorg-drv-video-nvidia_304 >/dev/null || apt_get_parsed install -y xorg-drv-video-nvidia_304 + echo $"Installing NVIDIA proprietary video driver (autodetected) packages" + dcop_write $"Installing/updating NVIDIA proprietary video driver (autodetected) packages..." 10 + NVIDIA_DETECTED=$(/sbin/nvidia-autoselect-driver | sed "s|.* ||") + rpm -q --whatprovides $NVIDIA_DETECTED >/dev/null || apt_get_parsed install -y $NVIDIA_DETECTED fi if [ "$INSTALL_FGLRX" = "1" ]; then @@ -229,10 +224,16 @@ if [ "$INSTALL_FLASH" = "1" ]; then nspluginscan rpm -q gnash && { echo $"Removing gnash" - sudo rpm -e gnash + sudo rpm -e gnash } fi +if [ "$INSTALL_PEPPERFLASH" = "1" ]; then + echo $"Installing pepper-flash plugin" + dcop_write $"Installing Pepper-Flash plugin..." 10 + /usr/bin/openmamba-netsrpms chromium-pepper-flash +fi + if [ "$INSTALL_CODECS" = "1" ]; then echo $"Installing win32 codecs" dcop_write $"Installing Win32 codecs..." 10