From 969a429dee28d5c91719bdefeb9603fef2862409 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 27 Jan 2017 10:56:46 +0100 Subject: Move the kde profile (logon) scripts from kde-baseapps to kservice. Needed because kde-baseapps has been split into multiple packages and is itself gone from the software collection. --- kde/post-install/kde-baseapps.post-install | 9 --------- kde/post-install/kde-baseapps/profile.d/kde.csh | 19 ------------------- kde/post-install/kde-baseapps/profile.d/kde.sh | 19 ------------------- kde/post-install/kservice.post-install | 9 +++++++++ kde/post-install/kservice/profile.d/kde.csh | 19 +++++++++++++++++++ kde/post-install/kservice/profile.d/kde.sh | 19 +++++++++++++++++++ 6 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 kde/post-install/kde-baseapps.post-install delete mode 100644 kde/post-install/kde-baseapps/profile.d/kde.csh delete mode 100644 kde/post-install/kde-baseapps/profile.d/kde.sh create mode 100644 kde/post-install/kservice.post-install create mode 100644 kde/post-install/kservice/profile.d/kde.csh create mode 100644 kde/post-install/kservice/profile.d/kde.sh diff --git a/kde/post-install/kde-baseapps.post-install b/kde/post-install/kde-baseapps.post-install deleted file mode 100644 index 3ae4e1c..0000000 --- a/kde/post-install/kde-baseapps.post-install +++ /dev/null @@ -1,9 +0,0 @@ -# Add profile scripts -mkdir -p $PKG/etc/profile.d -cat $CWD/post-install/kde-baseapps/profile.d/kde.sh \ - | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" \ - > $PKG/etc/profile.d/kde.sh -cat $CWD/post-install/kde-baseapps/profile.d/kde.csh \ - | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" \ - > $PKG/etc/profile.d/kde.csh -chmod 0755 $PKG/etc/profile.d/* diff --git a/kde/post-install/kde-baseapps/profile.d/kde.csh b/kde/post-install/kde-baseapps/profile.d/kde.csh deleted file mode 100644 index bb0ea69..0000000 --- a/kde/post-install/kde-baseapps/profile.d/kde.csh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/csh -# KDE additions: -if ( ! $?KDEDIRS ) then - setenv KDEDIRS /usr -endif -setenv PATH ${PATH}:/usr/lib/kf5:/usr/lib/kde4/libexec - -if ( $?XDG_CONFIG_DIRS ) then - setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/kde/xdg -else - setenv XDG_CONFIG_DIRS /etc/xdg:/etc/kde/xdg -endif - -if ( ! $?XDG_RUNTIME_DIR ) then - setenv XDG_RUNTIME_DIR /tmp/xdg-runtime-$USER - mkdir -p $XDG_RUNTIME_DIR - chown $USER $XDG_RUNTIME_DIR - chmod 700 $XDG_RUNTIME_DIR -endif diff --git a/kde/post-install/kde-baseapps/profile.d/kde.sh b/kde/post-install/kde-baseapps/profile.d/kde.sh deleted file mode 100644 index 8883fc8..0000000 --- a/kde/post-install/kde-baseapps/profile.d/kde.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# KDE additions: -KDEDIRS=/usr -export KDEDIRS -PATH="$PATH:/usr/lib/kf5:/usr/lib/kde4/libexec" -export PATH -if [ ! "$XDG_CONFIG_DIRS" = "" ]; then - XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/kde/xdg -else - XDG_CONFIG_DIRS=/etc/xdg:/etc/kde/xdg -fi -if [ "$XDG_RUNTIME_DIR" = "" ]; then - XDG_RUNTIME_DIR=/tmp/xdg-runtime-$USER - mkdir -p $XDG_RUNTIME_DIR - chown $USER $XDG_RUNTIME_DIR - chmod 700 $XDG_RUNTIME_DIR -fi -export XDG_CONFIG_DIRS XDG_RUNTIME_DIR - diff --git a/kde/post-install/kservice.post-install b/kde/post-install/kservice.post-install new file mode 100644 index 0000000..a014f3b --- /dev/null +++ b/kde/post-install/kservice.post-install @@ -0,0 +1,9 @@ +# Add profile scripts +mkdir -p $PKG/etc/profile.d +cat $CWD/post-install/kservice/profile.d/kde.sh \ + | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" \ + > $PKG/etc/profile.d/kde.sh +cat $CWD/post-install/kservice/profile.d/kde.csh \ + | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" \ + > $PKG/etc/profile.d/kde.csh +chmod 0755 $PKG/etc/profile.d/* diff --git a/kde/post-install/kservice/profile.d/kde.csh b/kde/post-install/kservice/profile.d/kde.csh new file mode 100644 index 0000000..bb0ea69 --- /dev/null +++ b/kde/post-install/kservice/profile.d/kde.csh @@ -0,0 +1,19 @@ +#!/bin/csh +# KDE additions: +if ( ! $?KDEDIRS ) then + setenv KDEDIRS /usr +endif +setenv PATH ${PATH}:/usr/lib/kf5:/usr/lib/kde4/libexec + +if ( $?XDG_CONFIG_DIRS ) then + setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/kde/xdg +else + setenv XDG_CONFIG_DIRS /etc/xdg:/etc/kde/xdg +endif + +if ( ! $?XDG_RUNTIME_DIR ) then + setenv XDG_RUNTIME_DIR /tmp/xdg-runtime-$USER + mkdir -p $XDG_RUNTIME_DIR + chown $USER $XDG_RUNTIME_DIR + chmod 700 $XDG_RUNTIME_DIR +endif diff --git a/kde/post-install/kservice/profile.d/kde.sh b/kde/post-install/kservice/profile.d/kde.sh new file mode 100644 index 0000000..8883fc8 --- /dev/null +++ b/kde/post-install/kservice/profile.d/kde.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# KDE additions: +KDEDIRS=/usr +export KDEDIRS +PATH="$PATH:/usr/lib/kf5:/usr/lib/kde4/libexec" +export PATH +if [ ! "$XDG_CONFIG_DIRS" = "" ]; then + XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/kde/xdg +else + XDG_CONFIG_DIRS=/etc/xdg:/etc/kde/xdg +fi +if [ "$XDG_RUNTIME_DIR" = "" ]; then + XDG_RUNTIME_DIR=/tmp/xdg-runtime-$USER + mkdir -p $XDG_RUNTIME_DIR + chown $USER $XDG_RUNTIME_DIR + chmod 700 $XDG_RUNTIME_DIR +fi +export XDG_CONFIG_DIRS XDG_RUNTIME_DIR + -- cgit v1.2.3