aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2012-04-22 14:10:41 +0000
committerJani Välimaa <wally@mageia.org>2012-04-22 14:10:41 +0000
commit5494badedff94dd9d3d8c40b9adcc8ae5754aaed (patch)
tree951e4bcb71758b88a0dd372d381fe7bdfd52f5dc
parent21a17d52bb8c774453192e0c5c1aeddc5998aa71 (diff)
downloadconfig-5494badedff94dd9d3d8c40b9adcc8ae5754aaed.tar
config-5494badedff94dd9d3d8c40b9adcc8ae5754aaed.tar.gz
config-5494badedff94dd9d3d8c40b9adcc8ae5754aaed.tar.bz2
config-5494badedff94dd9d3d8c40b9adcc8ae5754aaed.tar.xz
config-5494badedff94dd9d3d8c40b9adcc8ae5754aaed.zip
clean xfce4-firstrun
-rw-r--r--tools/xfce4-firstrun13
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/xfce4-firstrun b/tools/xfce4-firstrun
index fd17a36..dd09910 100644
--- a/tools/xfce4-firstrun
+++ b/tools/xfce4-firstrun
@@ -2,18 +2,19 @@
# 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`
+
+MGA_FLAVOUR=$(echo $META_CLASS)
+USER_DESKTOP=$(xdg-user-dir DESKTOP)
DESKTOP_FILE=$HOME/.config/autostart/xfce4-firstrun.desktop
-if [ `whoami` = "root" ]; then
+if [ $(whoami) = "root" ]; then
echo "xfce4-firstrun: not supported for superuser."
exit || 0
else
if [ ! -e $DESKTOP_FILE ]; then
echo "xfce4-firstrun: localised desktop folder exists."
if [ ! -d $HOME/.config/autostart ]; then
- mkdir -p $HOME/.config/autostart
+ mkdir -p $HOME/.config/autostart
fi
cat > $HOME/.config/autostart/xfce4-firstrun.desktop << EOF
@@ -32,8 +33,8 @@ EOF
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
+ 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.";