diff options
| author |   Dan Armak <danarmak@gentoo.org> | 2003-01-27 21:39:06 +0000 |
|---|---|---|
| committer | Dan Armak <danarmak@gentoo.org> | 2003-01-27 21:39:06 +0000 |
| commit | ed64e0f5e7e06d27b5e504c44725d1b19e99cf11 (patch) | |
| tree | 4cb75986d10b508ef306bcd9283cbcbe3d0b9aae | |
| parent | bump (diff) | |
| download | gentoo-2-ed64e0f5e7e06d27b5e504c44725d1b19e99cf11.tar.gz gentoo-2-ed64e0f5e7e06d27b5e504c44725d1b19e99cf11.tar.bz2 gentoo-2-ed64e0f5e7e06d27b5e504c44725d1b19e99cf11.zip | |
fix #12475 for kde 3.1: call /bin/mv in startkde because simple mv could be redefined in the shell to say mv -i
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/kdebase/files/3.1/startkde-3.1-gentoo.diff | 20 |
2 files changed, 18 insertions, 10 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index b6cd20cf44a7..1f1ff045dc82 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdebase # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.50 2003/01/17 20:31:28 hannes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.51 2003/01/27 21:39:06 danarmak Exp $ + + 27 Jan 2003; Dan Armak <danarmak@gentoo.org> files/3.1/startkde-3.1-gentoo.diff : + + Change mv, ls, cp, mkdir invocations to /bin/mv, /bin/cp etc. avoiding + problems in cases where the user has redefined 'mv' (via alias) in his + shell. Fixes bug #12475. *kdebase-2.2.2-r4 (17 Jan 2003) diff --git a/kde-base/kdebase/files/3.1/startkde-3.1-gentoo.diff b/kde-base/kdebase/files/3.1/startkde-3.1-gentoo.diff index 1349a4efdf49..9f652e30d3ef 100644 --- a/kde-base/kdebase/files/3.1/startkde-3.1-gentoo.diff +++ b/kde-base/kdebase/files/3.1/startkde-3.1-gentoo.diff @@ -1,6 +1,6 @@ ---- startkde 2002-11-30 18:58:15.000000000 +0100 -+++ startkde 2002-12-01 01:27:18.000000000 +0100 -@@ -1,12 +1,31 @@ +--- startkde 2002-11-30 19:58:15.000000000 +0200 ++++ startkde 2003-01-27 23:19:26.000000000 +0200 +@@ -1,12 +1,33 @@ -#!/bin/sh +#!/bin/sh --login # @@ -16,16 +16,18 @@ +export PATH="_KDEDIR_/bin:${PATH}" +export KDEDIR="_KDEDIR_" +export KDEDIRS="_KDEDIR_:/usr" # do NOT add env.d's KDEDIRS ++ ++# handle ~/.kde* dirs - separate ones for separate KDEs +cd ~ -+[ -d .kde ] && mv .kde .kde.backup ++[ -d .kde ] && /bin/mv .kde .kde.backup +if [ ! -e .kde3.1 ]; then + if [ -e .kde3 ]; then -+ cp -r .kde3 .kde3.1 ++ /bin/cp -r .kde3 .kde3.1 + else -+ mkdir .kde3.1 ++ /bin/mkdir .kde3.1 + fi +fi -+ln -sf .kde3.1 .kde ++/bin/ln -sf .kde3.1 .kde + +#export KDEHOME="${HOME}/.kdecvs" + @@ -34,7 +36,7 @@ # Boot sequence: # # kdeinit is used to fork off processes which improves memory usage -@@ -29,12 +48,12 @@ +@@ -29,12 +50,12 @@ # especially necessary on slow machines, where starting KDE takes one or two # minutes until anything appears on the screen. # @@ -49,7 +51,7 @@ xsetroot -cursor_name left_ptr $bkg # The user's personal KDE directory is usually ~/.kde, but this setting -@@ -140,7 +159,11 @@ +@@ -140,7 +161,11 @@ fi # the splashscreen and progress indicator |