diff options
| author | Frederic Crozat <fcrozat@mandriva.com> | 2007-08-23 17:33:23 +0000 |
|---|---|---|
| committer | Frederic Crozat <fcrozat@mandriva.com> | 2007-08-23 17:33:23 +0000 |
| commit | 3d72f421e0db9006a32db5ff13e29521615e782f (patch) | |
| tree | fbe0bcb53c7d17d88c6829a3e8edb6c0e586dffb | |
| parent | c8e6066ec969a907a74293026887ca9090d47b1f (diff) | |
| download | common-data-3d72f421e0db9006a32db5ff13e29521615e782f.tar common-data-3d72f421e0db9006a32db5ff13e29521615e782f.tar.gz common-data-3d72f421e0db9006a32db5ff13e29521615e782f.tar.bz2 common-data-3d72f421e0db9006a32db5ff13e29521615e782f.tar.xz common-data-3d72f421e0db9006a32db5ff13e29521615e782f.zip | |
discovery menu is dead
| -rwxr-xr-x | menu/menustyle.csh | 8 | ||||
| -rwxr-xr-x | menu/menustyle.sh | 11 |
2 files changed, 5 insertions, 14 deletions
diff --git a/menu/menustyle.csh b/menu/menustyle.csh index 74776db..6c43314 100755 --- a/menu/menustyle.csh +++ b/menu/menustyle.csh @@ -1,8 +1,4 @@ -if ($META_CLASS == desktop ) then - set MDV_MENU_STYLE=discovery -else - set MDV_MENU_STYLE=mandriva -endif +set MDV_MENU_STYLE=mandriva foreach file (/etc/sysconfig/menustyle $HOME/.menustyle) if ( -f $file ) then @@ -11,7 +7,7 @@ foreach file (/etc/sysconfig/menustyle $HOME/.menustyle) end if ($MDV_MENU_STYLE == discovery && ! ${?XDG_CONFIG_DIRS}) then - setenv XDG_CONFIG_DIRS /etc/xdg/discovery:/etc/xdg + set MDV_MENU_STYLE=mandriva endif setenv MDV_MENU_STYLE $MDV_MENU_STYLE diff --git a/menu/menustyle.sh b/menu/menustyle.sh index e1b5051..5a3d46e 100755 --- a/menu/menustyle.sh +++ b/menu/menustyle.sh @@ -1,15 +1,10 @@ -if [ "$META_CLASS" = "desktop" ]; then - MDV_MENU_STYLE=discovery -else - MDV_MENU_STYLE=mandriva -fi +MDV_MENU_STYLE=mandriva [ -r /etc/sysconfig/menustyle ] && source /etc/sysconfig/menustyle [ -r $HOME/.menustyle ] && source $HOME/.menustyle -if [ "$MDV_MENU_STYLE" = "discovery" -a "x$XDG_CONFIG_DIRS" = "x" ]; then - XDG_CONFIG_DIRS=/etc/xdg/discovery:/etc/xdg - export XDG_CONFIG_DIRS +if [ "$MDV_MENU_STYLE" = "discovery" ]; then + MDV_MENU_STYLE=mandriva fi export MDV_MENU_STYLE |