|
|
d02e729 |
diff -up kde-workspace-4.7.80/startkde.cmake.redhat_startkde kde-workspace-4.7.80/startkde.cmake
|
|
|
d02e729 |
--- kde-workspace-4.7.80/startkde.cmake.redhat_startkde 2011-11-17 21:55:51.000000000 +0100
|
|
|
d02e729 |
+++ kde-workspace-4.7.80/startkde.cmake 2011-11-21 14:47:09.947290754 +0100
|
|
|
d02e729 |
@@ -40,22 +40,6 @@ if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /
|
|
|
d02e729 |
export MALLOC_CHECK_
|
|
|
3772768 |
fi
|
|
|
3772768 |
|
|
|
3772768 |
-# in case we have been started with full pathname spec without being in PATH
|
|
|
3772768 |
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
|
|
|
3772768 |
-if [ -n "$bindir" ]; then
|
|
|
3772768 |
- qbindir=`$bindir/kde4-config --qt-binaries`
|
|
|
3772768 |
- if [ -n "$qbindir" ]; then
|
|
|
3772768 |
- case $PATH in
|
|
|
3772768 |
- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
|
|
|
3772768 |
- *) PATH=$qbindir:$PATH; export PATH;;
|
|
|
3772768 |
- esac
|
|
|
3772768 |
- fi
|
|
|
3772768 |
- case $PATH in
|
|
|
3772768 |
- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
|
|
|
3772768 |
- *) PATH=$bindir:$PATH; export PATH;;
|
|
|
3772768 |
- esac
|
|
|
3772768 |
-fi
|
|
|
3772768 |
-
|
|
|
3772768 |
# Boot sequence:
|
|
|
3772768 |
#
|
|
|
3772768 |
# kdeinit is used to fork off processes which improves memory usage
|
|
|
d02e729 |
@@ -76,6 +60,37 @@ fi
|
|
|
3772768 |
kdehome=$HOME/@KDE_DEFAULT_HOME@
|
|
|
3772768 |
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
|
|
|
3772768 |
|
|
|
3772768 |
+# Read LANG and write the country part to kdeglobals
|
|
|
3772768 |
+# de_AT.UTF-8 => Country=at
|
|
|
3772768 |
+# This is necessary because klocale.cpp (kdelibs) does only try to read the value
|
|
|
3772768 |
+# from kdeglobals and then falls back to default instead of triyng to detect it
|
|
|
3772768 |
+
|
|
|
3772768 |
+if [ ! -e $kdehome/share/config/kdeglobals ] || [ ! `grep "Country=" $kdehome/share/config/kdeglobals` ]; then
|
|
|
3772768 |
+ if [ ! $LANG ]; then
|
|
|
3772768 |
+ if [ -e /etc/default/locale ]; then
|
|
|
3772768 |
+ localefile='/etc/default/locale'
|
|
|
3772768 |
+ elif [ -e /etc/sysconfig/i18n ]; then
|
|
|
3772768 |
+ localefile='/etc/sysconfig/i18n'
|
|
|
3772768 |
+ elif [ -e /etc/environment ]; then
|
|
|
3772768 |
+ localefile='/etc/environment'
|
|
|
3772768 |
+ fi
|
|
|
3772768 |
+ if [ $localefile ]; then
|
|
|
3772768 |
+ locale=`sed -ne 's/^LANG="\(.*\)"$/\1/p' $localefile`
|
|
|
3772768 |
+ fi
|
|
|
3772768 |
+ else
|
|
|
3772768 |
+ locale=$LANG
|
|
|
3772768 |
+ fi
|
|
|
3772768 |
+ if [ $locale ]; then
|
|
|
3772768 |
+ country=`echo $locale | sed -ne 's/^[A-Za-z]*_\([A-Za-z]*\).*$/\1/p'|tr 'A-Z' 'a-z'`
|
|
|
3772768 |
+ if [ ! $country = "" ]; then
|
|
|
3772768 |
+cat >>$kdehome/share/config/kdeglobals <
|
|
|
3772768 |
+[Locale]
|
|
|
3772768 |
+Country=$country
|
|
|
3772768 |
+EOF
|
|
|
3772768 |
+ fi
|
|
|
3772768 |
+ fi
|
|
|
3772768 |
+fi
|
|
|
3772768 |
+
|
|
|
3772768 |
# see kstartupconfig source for usage
|
|
|
3772768 |
mkdir -m 700 -p $kdehome
|
|
|
3772768 |
mkdir -m 700 -p $kdehome/share
|
|
|
d02e729 |
@@ -93,7 +108,15 @@ krandrrc [Screen2]
|
|
|
3772768 |
krandrrc [Screen3]
|
|
|
3772768 |
kcmfonts General forceFontDPI 0
|
|
|
3772768 |
kdeglobals Locale Language '' # trigger requesting languages from KLocale
|
|
|
3772768 |
+kdeglobals Locale Country ''
|
|
|
3772768 |
EOF
|
|
|
3772768 |
+# read the default KSplash theme to use out of kde-settings
|
|
|
3772768 |
+if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ]
|
|
|
3772768 |
+ then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc`
|
|
|
3772768 |
+ if [ -n "$Theme" ]
|
|
|
3772768 |
+ then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys
|
|
|
3772768 |
+ fi
|
|
|
3772768 |
+fi
|
|
|
3772768 |
kstartupconfig4
|
|
|
3772768 |
returncode=$?
|
|
|
3772768 |
if test $returncode -ne 0; then
|
|
|
d02e729 |
@@ -171,8 +194,9 @@ fi
|
|
|
3772768 |
# better use the Autostart folder.
|
|
|
3772768 |
|
|
|
3772768 |
libpath=`kde4-config --path lib | tr : '\n'`
|
|
|
3772768 |
+envpath=/etc/kde/env/
|
|
|
3772768 |
|
|
|
3772768 |
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
|
|
|
3772768 |
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do
|
|
|
3772768 |
for file in "$prefix"*.sh; do
|
|
|
3772768 |
test -r "$file" && . "$file"
|
|
|
3772768 |
done
|
|
|
d02e729 |
@@ -381,7 +405,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
|
|
|
3772768 |
echo 'startkde: Running shutdown scripts...' 1>&2
|
|
|
3772768 |
|
|
|
3772768 |
# Run scripts found in $KDEDIRS/shutdown
|
|
|
3772768 |
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
|
|
|
3772768 |
+shutdownpath=/etc/kde/shutdown/
|
|
|
3772768 |
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do
|
|
|
3772768 |
for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
|
|
|
3772768 |
test -x "$prefix$file" && "$prefix$file"
|
|
|
3772768 |
done
|