diff options
| author | Nicolas Lécureuil <neoclust@mageia.org> | 2015-11-11 22:46:51 +0100 |
|---|---|---|
| committer | Nicolas Lécureuil <neoclust@mageia.org> | 2015-11-11 22:46:51 +0100 |
| commit | bc75302c36026c42262736bcd318957a25c993de (patch) | |
| tree | 82902279b751da218b123aa32559823e0053b6b6 | |
| parent | ba24d036d5edcfbe046619b0cfb2599e306455f1 (diff) | |
| download | config-bc75302c36026c42262736bcd318957a25c993de.tar config-bc75302c36026c42262736bcd318957a25c993de.tar.gz config-bc75302c36026c42262736bcd318957a25c993de.tar.bz2 config-bc75302c36026c42262736bcd318957a25c993de.tar.xz config-bc75302c36026c42262736bcd318957a25c993de.zip | |
Adapt for kconfig
| -rw-r--r-- | etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh b/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh index 413df55..36f23fd 100644 --- a/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh +++ b/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh @@ -4,18 +4,18 @@ # TODO: Factorize for Mageia 2 # -KRCFG="$(which kreadconfig)" +KRCFG="$(which kreadconfig5)" if [ ! -z "$KRCFG" ]; then # Check if kde is installed, otherwise do nothing # "Desktop" Mageia icons" - MGADESK=$(kreadconfig --group "Mageia" --key "MageiaDesktopFiles" --default "false") + MGADESK=$(kreadconfig5 --group "Mageia" --key "MageiaDesktopFiles" --default "false") if [ ! "$MGADESK" = "true" ]; then # 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 $(kreadconfig --file $HOME/.config/user-dirs.dirs --key XDG_DESKTOP_DIR)" ) + DIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DESKTOP_DIR)" ) if [ -z "${DIR}" ]; then DIR="$HOME/Desktop" fi @@ -29,17 +29,17 @@ if [ ! -z "$KRCFG" ]; then # Check if kde is installed, otherwise do nothing fi # Copy the "Trash" icon on the desktop - cp -f /usr/share/apps/kio_desktop/directory.trash "${DIR}/org.kde.trash.desktop" + cp -f /usr/share/kio_desktop/directory.trash "${DIR}/org.kde.trash.desktop" - kwriteconfig --group "Mageia" --key "MageiaDesktopFiles" --type "bool" 1 + kwriteconfig5 --group "Mageia" --key "MageiaDesktopFiles" --type "bool" 1 fi # Add .directory to XDG_*_DIR - ICONSXDGDIR=$(kreadconfig --group "Mageia" --key "IconsXdgDir" --default "false") + ICONSXDGDIR=$(kreadconfig5 --group "Mageia" --key "IconsXdgDir" --default "false") if [ ! "$ICONSXDGDIR" = "true" ]; then - MUSICDIR=$(eval "echo $(kreadconfig --file $HOME/.config/user-dirs.dirs --key XDG_MUSIC_DIR)" ) + MUSICDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_MUSIC_DIR)" ) if [ -z "$MUSICDIR" ]; then MUSICDIR="$HOME/Music" fi @@ -53,7 +53,7 @@ EOF fi - DLDIR=$(eval "echo $(kreadconfig --file $HOME/.config/user-dirs.dirs --key XDG_DOWNLOAD_DIR)" ) + DLDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DOWNLOAD_DIR)" ) if [ -z "$DLDIR" ]; then DLDIR="$HOME/Downloads" fi @@ -67,7 +67,7 @@ EOF fi - DOCDIR=$(eval "echo $(kreadconfig --file $HOME/.config/user-dirs.dirs --key XDG_DOCUMENTS_DIR)" ) + DOCDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DOCUMENTS_DIR)" ) if [ -z "$DOCDIR" ]; then DOCDIR="$HOME/Documents" fi @@ -81,7 +81,7 @@ EOF fi - PICTUREDIR=$(eval "echo $(kreadconfig --file $HOME/.config/user-dirs.dirs --key XDG_PICTURES_DIR)" ) + PICTUREDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_PICTURES_DIR)" ) if [ -z "$PICTUREDIR" ]; then PICTUREDIR="$HOME/Pictures" fi @@ -95,7 +95,7 @@ EOF fi - VIDEOSDIR=$(eval "echo $(kreadconfig --file $HOME/.config/user-dirs.dirs --key XDG_VIDEOS_DIR)" ) + VIDEOSDIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_VIDEOS_DIR)" ) if [ -z "$VIDEOSDIR" ]; then VIDEOSDIR="$HOME/Videos" fi @@ -107,7 +107,7 @@ Hidden=true Icon=folder-video EOF fi - kwriteconfig --group "Mageia" --key "IconsXdgDir" --type "bool" 1 + kwriteconfig5 --group "Mageia" --key "IconsXdgDir" --type "bool" 1 fi # end of main if: all the changes should be done inside this main if |