diff -crB orig/startkde my/startkde *** orig/startkde 2010-03-12 11:08:55.527187094 +0300 --- my/startkde 2010-03-12 10:49:19.823186650 +0300 *************** *** 65,71 **** [ -z "$KDEDIR" ] && KDEDIR=/usr export KDEDIR ! kdehome=$HOME/.kde test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"` export KDEROOTHOME="/root" --- 65,71 ---- [ -z "$KDEDIR" ] && KDEDIR=/usr export KDEDIR ! kdehome="$HOME"/.kde test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"` export KDEROOTHOME="/root" *************** *** 75,84 **** CONF_SKEL=$KDE_ALT_DATA/userconfig # see kstartupconfig source for usage ! mkdir -m 700 -p $kdehome ! mkdir -m 700 -p $kdehome/share ! mkdir -m 700 -p $kdehome/share/config ! cat >$kdehome/share/config/startupconfigkeys <<EOF kcminputrc Mouse cursorTheme '' kcminputrc Mouse cursorSize '' kpersonalizerrc General FirstLogin true --- 75,84 ---- CONF_SKEL=$KDE_ALT_DATA/userconfig # see kstartupconfig source for usage ! mkdir -m 700 -p "$kdehome" ! mkdir -m 700 -p "$kdehome/share" ! mkdir -m 700 -p "$kdehome/share/config" ! cat >"$kdehome/share/config/startupconfigkeys" <<EOF kcminputrc Mouse cursorTheme '' kcminputrc Mouse cursorSize '' kpersonalizerrc General FirstLogin true *************** *** 94,100 **** if test $? -ne 0; then xmessage -center "Could not start kstartupconfig. Check your installation." fi ! . $kdehome/share/config/startupconfig # XCursor mouse theme needs to be applied here to work even for kded or ksmserver if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then --- 94,100 ---- if test $? -ne 0; then xmessage -center "Could not start kstartupconfig. Check your installation." fi ! . "$kdehome/share/config/startupconfig" # XCursor mouse theme needs to be applied here to work even for kded or ksmserver if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then *************** *** 211,217 **** xsetroot -cursor_name left_ptr # create necessary directories/files ! mkdir -p $kdehome/share/config if ! [ -e "$HOME"/.smb/smb.conf ]; then mkdir -p "$HOME"/.smb --- 211,217 ---- xsetroot -cursor_name left_ptr # create necessary directories/files ! mkdir -p "$kdehome/share/config" if ! [ -e "$HOME"/.smb/smb.conf ]; then mkdir -p "$HOME"/.smb *************** *** 235,241 **** HOME_DESKTOP=`ReadConfig kdeglobals Paths Desktop "$HOME/Desktop"` if [ ! -d "$kdehome" -a -d $CONF_SKEL/.kde ]; then ! ( cd $CONF_SKEL/.kde && tar cpf - .kde ) | ( cd $kdehome && tar xpf - ) fi if [ ! -e "$kdehome"/share/config/emaildefaults ]; then --- 235,241 ---- HOME_DESKTOP=`ReadConfig kdeglobals Paths Desktop "$HOME/Desktop"` if [ ! -d "$kdehome" -a -d $CONF_SKEL/.kde ]; then ! ( cd $CONF_SKEL/.kde && tar cpf - .kde ) | ( cd "$kdehome" && tar xpf - ) fi if [ ! -e "$kdehome"/share/config/emaildefaults ]; then *************** *** 259,268 **** fi HOME_AUTOSTART=`ReadConfig kdeglobals Paths Autostart "$kdehome/Autostart"` ! mkdir -p $HOME_AUTOSTART ! if [ ! -d $kdehome/share/apps/konqueror ] ; then ! mkdir -p $kdehome/share/apps/konqueror/ # Install bookmarks for bookmarksfile in \ "/etc/kde/distribution$KDE_ALT_DATA/bookmarks-$KDELANG.xml" \ --- 259,268 ---- fi HOME_AUTOSTART=`ReadConfig kdeglobals Paths Autostart "$kdehome/Autostart"` ! mkdir -p "$HOME_AUTOSTART" ! if [ ! -d "$kdehome/share/apps/konqueror" ] ; then ! mkdir -p "$kdehome/share/apps/konqueror/" # Install bookmarks for bookmarksfile in \ "/etc/kde/distribution$KDE_ALT_DATA/bookmarks-$KDELANG.xml" \ *************** *** 271,283 **** "$KDE_ALT_DATA/bookmarks.xml" do if [ -f "$bookmarksfile" ]; then ! cp "$bookmarksfile" $kdehome/share/apps/konqueror/bookmarks.xml break fi done fi ! usr_fdir=$HOME/.fonts # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap if test -n "$GS_LIB" ; then GS_LIB=$usr_fdir:$GS_LIB --- 271,283 ---- "$KDE_ALT_DATA/bookmarks.xml" do if [ -f "$bookmarksfile" ]; then ! cp "$bookmarksfile" "$kdehome/share/apps/konqueror/bookmarks.xml" break fi done fi ! usr_fdir="$HOME"/.fonts # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap if test -n "$GS_LIB" ; then GS_LIB=$usr_fdir:$GS_LIB