diff options
| author | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-02-17 20:36:31 +0000 |
|---|---|---|
| committer | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-02-17 20:36:31 +0000 |
| commit | c9ffc048a56e7fcfd1c07e55a023b68e3b53e6f0 (patch) | |
| tree | 25fcd048a74c56bdc881141ef5b149b942ba0cdf /tools/xfce4-firstrun | |
| parent | eeecb61890530e8ee1e75200042c3c3d8d1261c4 (diff) | |
| download | config-c9ffc048a56e7fcfd1c07e55a023b68e3b53e6f0.tar config-c9ffc048a56e7fcfd1c07e55a023b68e3b53e6f0.tar.gz config-c9ffc048a56e7fcfd1c07e55a023b68e3b53e6f0.tar.bz2 config-c9ffc048a56e7fcfd1c07e55a023b68e3b53e6f0.tar.xz config-c9ffc048a56e7fcfd1c07e55a023b68e3b53e6f0.zip | |
Synthesized commit during git-svn import combining previous Mandriva history with Mageia.
This commit consitsts of the following subversion commits:
------------------------------------------------------------------------
r571 | ahmad | 2011-02-17 20:36:31 +0000 (Thu, 17 Feb 2011) | 1 line
- add cleaned mageia-xfce-config
------------------------------------------------------------------------
In addition to the above commits, the following cleaning work has been recorded:
- clean mandriva occurences in files names (icons files)
- remove unsued themes and create Default one
Diffstat (limited to 'tools/xfce4-firstrun')
| -rw-r--r-- | tools/xfce4-firstrun | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/tools/xfce4-firstrun b/tools/xfce4-firstrun index 7fa83da..d6be828 100644 --- a/tools/xfce4-firstrun +++ b/tools/xfce4-firstrun @@ -3,7 +3,6 @@ # Author: tpg@mandriva.org # Licensed under GPL terms -MDV_FLAVOUR=`echo $META_CLASS` USER_DESKTOP=`xdg-user-dir DESKTOP` DESKTOP_FILE=$HOME/.config/autostart/xfce4-firstrun.desktop @@ -23,35 +22,14 @@ Hidden=true EOF # - if [ $MDV_FLAVOUR = "download" -o $MDV_FLAVOUR = "desktop" ]; then - if [ ! -e $USER_DESKTOP/register.desktop ]; then - cp -f /usr/share/mdk/desktop/free/register.desktop $USER_DESKTOP 2> /dev/null - fi - - if [ ! -e $USER_DESKTOP/upgrade.desktop ]; then - cp -f /usr/share/mdk/desktop/one/upgrade.desktop $USER_DESKTOP 2> /dev/null - fi - - if [ ! -e $USER_DESKTOP/mandriva-draklive-install.desktop ]; then - cp -f /usr/share/applications/mandriva-draklive-install.desktop $USER_DESKTOP 2> /dev/null + if [ ! -e $USER_DESKTOP/mageia-draklive-install.desktop ]; then + cp -f /usr/share/applications/mageia-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 - else - if [ ! -e $USER_DESKTOP/register.desktop ]; then - cp -f /usr/share/mdk/desktop/powerpack/register.desktop $USER_DESKTOP 2> /dev/null - fi - - 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 |