mambabase: autodetect NVIDIA proprietary driver and add chromium-pepper-flash
This commit is contained in:
parent
7ed703c52e
commit
89f03c5d15
@ -841,85 +841,6 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
|
||||
<set>WordBreak|AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="ScriptObject">
|
||||
<property name="name">
|
||||
<cstring>checkform3</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>370</y>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="associations" stdset="0">
|
||||
<stringlist>
|
||||
<string>@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</string>
|
||||
</stringlist>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="GroupBox">
|
||||
<property name="name">
|
||||
<cstring>GroupBox2_2_2</cstring>
|
||||
@ -950,7 +871,7 @@ fi</string>
|
||||
</widget>
|
||||
<widget class="CheckBox">
|
||||
<property name="name">
|
||||
<cstring>inst_nvidia_legacy</cstring>
|
||||
<cstring>inst_nvidia</cstring>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
@ -958,13 +879,16 @@ fi</string>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>40</y>
|
||||
<y>20</y>
|
||||
<width>510</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>NVIDIA propri&etary video driver (legacy) from openmamba.org</string>
|
||||
<string>NVIDIA proprietary video &driver (autodetected) from openmamba.org</string>
|
||||
</property>
|
||||
<property name="tristate">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="associations" stdset="0">
|
||||
<stringlist>
|
||||
@ -981,6 +905,32 @@ fi</string>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>40</y>
|
||||
<width>510</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>AMD/ATI propri&etary video driver from openmamba.org</string>
|
||||
</property>
|
||||
<property name="associations" stdset="0">
|
||||
<stringlist>
|
||||
<string></string>
|
||||
<string></string>
|
||||
<string></string>
|
||||
</stringlist>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="CheckBox">
|
||||
<property name="name">
|
||||
<cstring>inst_fglrx_legacy</cstring>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
@ -990,7 +940,59 @@ fi</string>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>AMD/ATI proprietary video driver from openmamba.org</string>
|
||||
<string>AMD/ATI proprietary video driver (le&gacy) from openmamba.org</string>
|
||||
</property>
|
||||
<property name="associations" stdset="0">
|
||||
<stringlist>
|
||||
<string></string>
|
||||
<string></string>
|
||||
<string></string>
|
||||
</stringlist>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="CheckBox">
|
||||
<property name="name">
|
||||
<cstring>inst_broadcom_sta</cstring>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>80</y>
|
||||
<width>510</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Broadcom-sta proprietary wireless driver from openmamba.org</string>
|
||||
</property>
|
||||
<property name="associations" stdset="0">
|
||||
<stringlist>
|
||||
<string></string>
|
||||
<string></string>
|
||||
<string></string>
|
||||
</stringlist>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="CheckBox">
|
||||
<property name="name">
|
||||
<cstring>inst_b43</cstring>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>100</y>
|
||||
<width>510</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Broadcom B43 proprietary firmware from openwrt.org</string>
|
||||
</property>
|
||||
<property name="associations" stdset="0">
|
||||
<stringlist>
|
||||
@ -1107,6 +1109,28 @@ fi</string>
|
||||
</stringlist>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="CheckBox">
|
||||
<property name="name">
|
||||
<cstring>inst_codecs</cstring>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>180</y>
|
||||
<width>500</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Win32 codecs from mplayerhq.hu</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="CheckBox">
|
||||
<property name="name">
|
||||
<cstring>inst_msttcf</cstring>
|
||||
@ -1143,7 +1167,7 @@ fi</string>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>140</y>
|
||||
<y>120</y>
|
||||
<width>510</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
@ -1157,7 +1181,7 @@ fi</string>
|
||||
</widget>
|
||||
<widget class="CheckBox">
|
||||
<property name="name">
|
||||
<cstring>inst_codecs</cstring>
|
||||
<cstring>inst_pepperflash</cstring>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
@ -1165,125 +1189,18 @@ fi</string>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>180</y>
|
||||
<width>500</width>
|
||||
<y>139</y>
|
||||
<width>510</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Win32 codecs from mplayerhq.hu</string>
|
||||
<string>Pepper-Flas&h plugin for chromium from google.com</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="CheckBox">
|
||||
<property name="name">
|
||||
<cstring>inst_nvidia</cstring>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>20</y>
|
||||
<width>510</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>NVIDIA proprietary video &driver from openmamba.org</string>
|
||||
</property>
|
||||
<property name="tristate">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="associations" stdset="0">
|
||||
<stringlist>
|
||||
<string></string>
|
||||
<string></string>
|
||||
<string></string>
|
||||
</stringlist>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="CheckBox">
|
||||
<property name="name">
|
||||
<cstring>inst_fglrx_legacy</cstring>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>80</y>
|
||||
<width>510</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>AMD/ATI proprietary video driver (le&gacy) from openmamba.org</string>
|
||||
</property>
|
||||
<property name="associations" stdset="0">
|
||||
<stringlist>
|
||||
<string></string>
|
||||
<string></string>
|
||||
<string></string>
|
||||
</stringlist>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="CheckBox">
|
||||
<property name="name">
|
||||
<cstring>inst_b43</cstring>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>120</y>
|
||||
<width>510</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Broadcom B43 proprietary firmware from openwrt.org</string>
|
||||
</property>
|
||||
<property name="associations" stdset="0">
|
||||
<stringlist>
|
||||
<string></string>
|
||||
<string></string>
|
||||
<string></string>
|
||||
</stringlist>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="CheckBox">
|
||||
<property name="name">
|
||||
<cstring>inst_broadcom_sta</cstring>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>100</y>
|
||||
<width>510</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Broadcom-sta proprietary wireless driver from openmamba.org</string>
|
||||
</property>
|
||||
<property name="associations" stdset="0">
|
||||
<stringlist>
|
||||
<string></string>
|
||||
<string></string>
|
||||
<string></string>
|
||||
</stringlist>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="Label">
|
||||
<property name="name">
|
||||
@ -1305,6 +1222,86 @@ WARNING: you'll have to accept a license agreement for most selected packages.</
|
||||
<set>WordBreak|AlignTop</set>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="ScriptObject">
|
||||
<property name="name">
|
||||
<cstring>checkform3</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>370</y>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="associations" stdset="0">
|
||||
<stringlist>
|
||||
<string>@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</string>
|
||||
</stringlist>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget">
|
||||
<property name="name">
|
||||
@ -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()'
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# openmamba post installation script
|
||||
# Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
# Copyright (c) 2007-2015 by Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
#
|
||||
# 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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user