Attachment 273131 Details for Bug 393421 – Updated redhat-startkde patch

[patch] Updated redhat-startkde patch

kdebase-workspace-3.96.1-redhat-startkde.patch (text/plain), 3.22 KB, created by Kevin Kofler on 2007-11-29 18:17:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Kofler

Created: 2007-11-29 18:17:15 UTC

Size: 3.22 KB

patch

obsolete

>diff -ur kdebase-workspace-3.96.1/startkde.cmake kdebase-workspace-3.96.1-redhat-startkde/startkde.cmake
>--- kdebase-workspace-3.96.1/startkde.cmake	2007-10-31 23:57:35.000000000 +0100
>+++ kdebase-workspace-3.96.1-redhat-startkde/startkde.cmake	2007-11-29 19:12:56.000000000 +0100
>@@ -2,6 +2,53 @@
> #
> #  DEFAULT KDE STARTUP SCRIPT ( @KDE_VERSION_STRING@ )
> #
>+#  Modified for Red Hat Linux
>+
>+unset BLOCK_SIZE # breaks parsing of df output
>+shopt -u -o noclobber # allow overwriting of files with '>'
>+
>+# set up user environment if not present
>+# check for space on /tmp and "$HOME" and for write access
>+#  error exit, if not
>+space_tmp=`LANG=C df /tmp | xargs | cut -d" " -f11`
>+homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8`
>+
>+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
>+    # check for AFS
>+    space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10`
>+else
>+    # check regular mounts
>+    space_home=`LANG=C df "$HOME" | xargs | cut -d" " -f11`
>+fi
>+
>+if [ $space_tmp -lt 50 ]; then
>+    echo $"Not enough free disk space on /tmp"
>+    exit 1
>+fi
>+
>+if [ $space_home -lt 25 ]; then
>+    echo $"Not enough free disk space on "$HOME""
>+    exit 1
>+fi
>+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
>+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
>+
>+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
>+    echo $"You don't have write permissions for /tmp"
>+    exit 1
>+fi
>+rm -f $testfile_tmp
>+
>+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
>+     echo $"You don't have write permissions for "$HOME""
>+     exit 1
>+fi
>+rm -f $testfile_home
>+
>+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
>+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
>+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
>+fi
> 
> # When the X server dies we get a HUP signal from xinit. We must ignore it
> # because we still need to do some cleanup.
>@@ -14,12 +61,12 @@
> 	exit 1
> fi
> 
>-# Set the background to plain grey.
>+# Set the background to the Red Hat default
> # The standard X background is nasty, causing moire effects and exploding
> # people's heads. We use colours from the standard KDE palette for those with
> # palettised displays.
> if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
>-  xsetroot -solid "#000000"
>+  xsetroot -solid "#5477A0"
> fi
> 
> # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
>@@ -182,9 +229,10 @@
> # better use the Autostart folder.
> 
> exepath=`kde4-config --path exe | tr : '\n'`
>+envpath=/etc/kde/env/
> 
>-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
>-  for file in "$prefix"*.sh; do
>+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'` $envpath ; do
>+  for file in "$prefix"*.sh ; do
>     test -r "$file" && . "$file"
>   done
> done
>@@ -387,7 +435,8 @@
> echo 'startkde: Running shutdown scripts...'  1>&2
> 
> # Run scripts found in $KDEDIRS/shutdown
>-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
>+shutdownpath=/etc/kde/shutdown/
>+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'` $shutdownpath; do
>   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
>     test -x "$prefix$file" && "$prefix$file"
>   done

Actions: View | Diff

Attachments on bug 393421: 273131 | 273141