From 14e8cea0f70a569ca945d29b5b1621f4e8ef1721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= <neoclust@mageia.org>
Date: Mon, 26 Dec 2016 22:46:22 +0100
Subject: Fix use of kreadconfig5

---
 etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh b/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh
index e0a3fdf..afb9924 100644
--- a/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh
+++ b/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh
@@ -15,7 +15,7 @@ if [ ! -z "$KRCFG" ]; then # Check if kde is installed, otherwise do nothing
         # TODO: We need to handle default => Default too 
         PROD=$(sed 's/.*product=\(.*\)/\L\1/' < /etc/product.id)
         # We should handle i18n dir modes in xgd user dirs
-        DIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DESKTOP_DIR)" )
+        DIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DESKTOP_DIR --group "" )" )
         if [ -z "${DIR}" ]; then
             DIR="$HOME/Desktop"
         fi
@@ -39,7 +39,7 @@ if [ ! -z "$KRCFG" ]; then # Check if kde is installed, otherwise do nothing
 
     if [ ! "$ICONSXDGDIR" = "true" ]; then
 
-        MUSICDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_MUSIC_DIR)" )
+        MUSICDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_MUSIC_DIR --group "" )" )
         if [ -z "$MUSICDIR" ]; then
             MUSICDIR="$HOME/Music"
         fi
@@ -53,7 +53,7 @@ EOF
         fi
 
 
-        DLDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DOWNLOAD_DIR)" )
+        DLDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DOWNLOAD_DIR --group "" )" )
         if [ -z "$DLDIR" ]; then
             DLDIR="$HOME/Downloads"
         fi
@@ -67,7 +67,7 @@ EOF
         fi
 
 
-        DOCDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DOCUMENTS_DIR)" )
+        DOCDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DOCUMENTS_DIR --group "" )" )
         if [ -z "$DOCDIR" ]; then
             DOCDIR="$HOME/Documents"
         fi
@@ -81,7 +81,7 @@ EOF
         fi
 
 
-        PICTUREDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_PICTURES_DIR)" )
+        PICTUREDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_PICTURES_DIR --group "" )" )
         if [ -z "$PICTUREDIR" ]; then
             PICTUREDIR="$HOME/Pictures"
         fi
@@ -95,7 +95,7 @@ EOF
         fi
 
 
-        VIDEOSDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_VIDEOS_DIR)" )
+        VIDEOSDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_VIDEOS_DIR --group "" )" )
         if [ -z "$VIDEOSDIR" ]; then
             VIDEOSDIR="$HOME/Videos"
         fi
@@ -113,7 +113,7 @@ EOF
     # "Desktop" Mageia icons"
     MGA5to6=$(kreadconfig5 --group "Mageia" --key "Mageia5to6" --default "false")
     if [ ! "$MGA5to6" = "true" ]; then
-	DIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DESKTOP_DIR)" )
+	DIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DESKTOP_DIR --group "" )" )
 	HOME="$DIR/Home2.desktop"
 	TRASH="$DIR/trash.desktop"
 	if [ -e "$HOME"]; then
-- 
cgit v1.2.1