root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

Merge branch 'devel' of github.com:manjaro/manjaro-tools into devel

Browse source
This commit is contained in:
udeved 2015-02-02 06:37:08 +01:00
commit 1798d6e241
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/util-livecd.sh
View file

@ -224,6 +224,26 @@ configure_env_live(){
sed -i -e "s~^.*Exec=.*~Exec=mate-terminal -e 'sudo setup'~" "/etc/skel/Desktop/installer-launcher-cli.desktop"
sed -i -e "s~^.*Terminal=.*~Terminal=false~" "/etc/skel/Desktop/installer-launcher-cli.desktop"
fi
## FIXME - Workaround to match theme with QT5
cmd=$(echo "QT_STYLE_OVERRIDE=gtk" >> /etc/environment)
if [ -e "/bootmnt/${install_dir}/${arch}/xfce-image.sqfs" ] ; then
$cmd
elif [ -e "/bootmnt/${install_dir}/${arch}/gnome-image.sqfs" ] ; then
$cmd
elif [ -e "/bootmnt/${install_dir}/${arch}/cinnamon-image.sqfs" ] ; then
$cmd
elif [ -e "/bootmnt/${install_dir}/${arch}/openbox-image.sqfs" ] ; then
$cmd
elif [ -e "/bootmnt/${install_dir}/${arch}/mate-image.sqfs" ] ; then
$cmd
elif [ -e "/bootmnt/${install_dir}/${arch}/lxde-image.sqfs" ] ; then
$cmd
elif [ -e "/bootmnt/${install_dir}/${arch}/enlightenment-image.sqfs" ] ; then
$cmd
elif [ -e "/bootmnt/${install_dir}/${arch}/pekwm-image.sqfs" ] ; then
$cmd
fi
}
configure_user_root_live(){