diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | tools/xfce4-firstrun | 11 |
2 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2011-02-20 17:29 Ahmad Samir <ahmadsamir3891 at gmail.com> + * tools/xfce4-firstrun: + - correct the xfce4-firstrun script + 2011-02-20 17:21 Ahmad Samir <ahmadsamir3891 at gmail.com> * common/xfce4/panel/xfce4-menu-5.rc: - use mageia.png for the menu diff --git a/tools/xfce4-firstrun b/tools/xfce4-firstrun index d6be828..330b7cf 100644 --- a/tools/xfce4-firstrun +++ b/tools/xfce4-firstrun @@ -2,7 +2,7 @@ # Simple script which configure Xfce environment for a fresh user # Author: tpg@mandriva.org # Licensed under GPL terms - +MGA_FLAVOUR=`echo $META_CLASS` USER_DESKTOP=`xdg-user-dir DESKTOP` DESKTOP_FILE=$HOME/.config/autostart/xfce4-firstrun.desktop @@ -22,6 +22,7 @@ Hidden=true EOF # + if [ $MGA_FLAVOUR = "download" -o $MGA_FLAVOUR = "desktop" ]; then if [ ! -e $USER_DESKTOP/mageia-draklive-install.desktop ]; then cp -f /usr/share/applications/mageia-draklive-install.desktop $USER_DESKTOP 2> /dev/null fi @@ -29,7 +30,15 @@ EOF xfdesktop --reload 1> /dev/null; echo "xfce4-firstrun: xfdesktop reloaded."; fi exit || 0 + else + if [ ! -e $USER_DESKTOP/mandriva-draklive-install.desktop ]; then + cp -f /usr/share/applications/mandriva-draklive-install.desktop $USER_DESKTOP 2> /dev/null + fi + if [ "$(pidof xfdesktop)" ]; then + xfdesktop --reload 1> /dev/null; echo "xfce4-firstrun: xfdesktop reloaded."; + fi + exit || 0 fi else echo "xfce4-firstrun: make sure you have installed xdg-user-dirs-gtk and xdg-user-dir packages." fi |