summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-26 14:41:36 -0600
committerTimothy Pearson <[email protected]>2012-02-26 14:41:36 -0600
commit618f2521c3406cb4cb02689d93f5f950e5f94027 (patch)
treec5e419510449dcb70d20502eccbd28a4bc2dc622
parent3862d9bc994791982446306877a8071d764ccd87 (diff)
downloadtdebase-618f2521c3406cb4cb02689d93f5f950e5f94027.tar.gz
tdebase-618f2521c3406cb4cb02689d93f5f950e5f94027.zip
Rename kde-config to tde-config
-rw-r--r--doc/faq/configkde.docbook2
-rw-r--r--doc/kate/advanced.docbook2
-rw-r--r--doc/userguide/index.docbook2
-rw-r--r--doc/userguide/under-the-hood.docbook2
-rw-r--r--kate/data/externaltools2
-rwxr-xr-xkcontrol/kthememanager/kdeinstallktheme2
-rw-r--r--khelpcenter/searchhandlers/khc_beagle_index.pl2
-rwxr-xr-xkhelpcenter/searchhandlers/khc_docbookdig.pl.in2
-rw-r--r--klipper/klipper-trinity1.sh2
-rw-r--r--konqueror/sidebar/move_konqsidebartng_entries.sh2
-rwxr-xr-xksmserver/move_session_config.sh2
-rwxr-xr-xlibkonq/favicons/move_favicons.sh4
-rw-r--r--starttde8
-rw-r--r--tdm/kfrontend/gentdmconf.c2
14 files changed, 18 insertions, 18 deletions
diff --git a/doc/faq/configkde.docbook b/doc/faq/configkde.docbook
index b51090b66..8f687f69b 100644
--- a/doc/faq/configkde.docbook
+++ b/doc/faq/configkde.docbook
@@ -198,7 +198,7 @@ usually a folder named <filename class="directory">.kde</filename>
folder. If you want scripts to be executed for all &tde; users, you can
put them under <filename class="directory">$<envar>TDEDIR</envar>/env/</filename>, where $<envar>TDEDIR</envar> is the prefix &tde; was
installed to (you can find this out using the command
-<userinput><command>kde-config</command> --prefix</userinput>).</para>
+<userinput><command>tde-config</command> --prefix</userinput>).</para>
<para>If you wish to start a program after &tde; has started, you may want to use the
<filename class="directory">Autostart</filename> folder. To add
entries to the <filename class="directory">Autostart</filename> folder:
diff --git a/doc/kate/advanced.docbook b/doc/kate/advanced.docbook
index 224610e62..d16437121 100644
--- a/doc/kate/advanced.docbook
+++ b/doc/kate/advanced.docbook
@@ -653,7 +653,7 @@ only. The requirements is that the script is placed in a folder where &kate;
can find it, along with an optional .desktop file that defines the related
properties. The valid folder are named <filename>katepart/scripts</filename>
in the &tde; data folders. You can find the data folders by running the command
-<command>kde-config <option>--path</option> <parameter>data</parameter></command>
+<command>tde-config <option>--path</option> <parameter>data</parameter></command>
You will usually have at least a system and a personal data folder. Of course
scripts in the system data folder are available to all users on the system,
while those in the personal folder are available for you only.</para>
diff --git a/doc/userguide/index.docbook b/doc/userguide/index.docbook
index 03a886cd6..ecf4ee3d7 100644
--- a/doc/userguide/index.docbook
+++ b/doc/userguide/index.docbook
@@ -227,7 +227,7 @@ Although this guide is revised periodically, those traditional terms might still
<varlistentry>
<term>&tde; prefix</term>
<listitem><para>&tde; installs into its own folder tree, which is found by
-running the command <userinput><command>kde-config</command> <option>--prefix</option></userinput>. This folder is referred to
+running the command <userinput><command>tde-config</command> <option>--prefix</option></userinput>. This folder is referred to
by the environment variable $<envar>TDEDIR</envar> and possibly
$<envar>TDEDIRS</envar>.</para>
</listitem>
diff --git a/doc/userguide/under-the-hood.docbook b/doc/userguide/under-the-hood.docbook
index 97a9f839c..e42b06da9 100644
--- a/doc/userguide/under-the-hood.docbook
+++ b/doc/userguide/under-the-hood.docbook
@@ -23,7 +23,7 @@ class="directory">.kde/share/config</filename> (replace
the global ones are in the <filename
class="directory">share/config</filename> sub-directory of &tde;'s
installation path. (You can find this path by running the command
-<command>kde-config --prefix</command>.) Their filenames typically
+<command>tde-config --prefix</command>.) Their filenames typically
end in rc (without an initial period), for example <filename>kopeterc</filename>.</para>
<warning><para>
diff --git a/kate/data/externaltools b/kate/data/externaltools
index 19d931976..9057b7340 100644
--- a/kate/data/externaltools
+++ b/kate/data/externaltools
@@ -39,7 +39,7 @@ save=1
[externaltool_EmailCVSDiffforCurrentDocument]
acname=externaltool_EmailCVSDiffforCurrentDocument
cmdname=
-command=cd %directory\nif [ -d CVS ] && grep %filename CVS/Entries > /dev/null ; then\n cvs diff -ubB %filename > $(kde-config --path tmp)%filename.diff \n kmail --composer --attach $(kde-config --path tmp)%filename.diff\nelse\n kdialog --title Error -msgbox "The file '%filename' is not in CVS"\nfi
+command=cd %directory\nif [ -d CVS ] && grep %filename CVS/Entries > /dev/null ; then\n cvs diff -ubB %filename > $(tde-config --path tmp)%filename.diff \n kmail --composer --attach $(tde-config --path tmp)%filename.diff\nelse\n kdialog --title Error -msgbox "The file '%filename' is not in CVS"\nfi
executable=kmail
icon=kmail
mimetypes=
diff --git a/kcontrol/kthememanager/kdeinstallktheme b/kcontrol/kthememanager/kdeinstallktheme
index b606fe16b..95b40eec6 100755
--- a/kcontrol/kthememanager/kdeinstallktheme
+++ b/kcontrol/kthememanager/kdeinstallktheme
@@ -1,6 +1,6 @@
#!/bin/sh
# Installs a KDE theme (into the user's theme dir)
-appsdir=`kde-config --path data | sed -e 's/:.*//'`
+appsdir=`tde-config --path data | sed -e 's/:.*//'`
themedir=$appsdir"/kthememanager/themes/"`basename "$1" ".kth"`
if test -n "$appsdir"; then
test -d "$themedir" || mkdir -p "$themedir"
diff --git a/khelpcenter/searchhandlers/khc_beagle_index.pl b/khelpcenter/searchhandlers/khc_beagle_index.pl
index 02f1b9330..aaec63607 100644
--- a/khelpcenter/searchhandlers/khc_beagle_index.pl
+++ b/khelpcenter/searchhandlers/khc_beagle_index.pl
@@ -5,7 +5,7 @@ use warnings;
sub getKDEDocDir()
{
- my $prefix = `kde-config --prefix`;
+ my $prefix = `tde-config --prefix`;
chomp $prefix;
$prefix = "/opt/kde" if (not defined($prefix));
diff --git a/khelpcenter/searchhandlers/khc_docbookdig.pl.in b/khelpcenter/searchhandlers/khc_docbookdig.pl.in
index e49df688d..dfc826ab8 100755
--- a/khelpcenter/searchhandlers/khc_docbookdig.pl.in
+++ b/khelpcenter/searchhandlers/khc_docbookdig.pl.in
@@ -29,7 +29,7 @@ use Getopt::Long;
my $htdigdata = "/etc/htdig";
my $htdigbin = "/usr/bin";
my $kdeprefix = "@prefix@";
-my $kdehtmldir = `kde-config --expandvars --install html`;
+my $kdehtmldir = `tde-config --expandvars --install html`;
chomp $kdeprefix;
chomp $kdehtmldir;
diff --git a/klipper/klipper-trinity1.sh b/klipper/klipper-trinity1.sh
index 755915fdc..6e8bd15db 100644
--- a/klipper/klipper-trinity1.sh
+++ b/klipper/klipper-trinity1.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-filename=`kde-config --localprefix`share/autostart/klipper.desktop
+filename=`tde-config --localprefix`share/autostart/klipper.desktop
if grep 'Hidden=true' "$filename" > /dev/null 2> /dev/null; then
echo AutoStart=false
else
diff --git a/konqueror/sidebar/move_konqsidebartng_entries.sh b/konqueror/sidebar/move_konqsidebartng_entries.sh
index 83de07bf3..fe6fb45fc 100644
--- a/konqueror/sidebar/move_konqsidebartng_entries.sh
+++ b/konqueror/sidebar/move_konqsidebartng_entries.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-prefix=$(kde-config --localprefix)
+prefix=$(tde-config --localprefix)
source="$prefix/share/apps/konqsidebartng"
[ -d "$source/entries" ] || exit 0
diff --git a/ksmserver/move_session_config.sh b/ksmserver/move_session_config.sh
index fb8b52526..631dbcd74 100755
--- a/ksmserver/move_session_config.sh
+++ b/ksmserver/move_session_config.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-prefix=`kde-config --localprefix`
+prefix=`tde-config --localprefix`
source="${prefix}/share/config"
dest="${prefix}/share/config/session"
diff --git a/libkonq/favicons/move_favicons.sh b/libkonq/favicons/move_favicons.sh
index a06d7d2bd..e5b282790 100755
--- a/libkonq/favicons/move_favicons.sh
+++ b/libkonq/favicons/move_favicons.sh
@@ -1,9 +1,9 @@
#!/bin/sh
-prefix=$(kde-config --localprefix)
+prefix=$(tde-config --localprefix)
source1="$prefix/share/icons/favicons"
source2="$prefix/share/cache/favicons"
-dest="$(kde-config --path cache)/favicons"
+dest="$(tde-config --path cache)/favicons"
if [ -n "$prefix" -a -d "$source1" ]; then
while [ ! -d "$dest" ]; do
diff --git a/starttde b/starttde
index ea7019263..6c47b723a 100644
--- a/starttde
+++ b/starttde
@@ -26,7 +26,7 @@ echo "[starttde] This script is $0" 1>&2
# the existence of $TDEDIR. That environment variable might not be
# defined or defined to point to KDE4 binaries.
BIN_DIR="`dirname $0`"
-# Do not use kde-config to determine the version. That command creates a
+# Do not use tde-config to determine the version. That command creates a
# profile directory in the root of the file system. Refer to Bug Report 293.
if [ -x $BIN_DIR/konqueror ]; then
TDE_VERSION="`$BIN_DIR/konqueror --version | grep TDE | awk '{print $2}'`"
@@ -127,10 +127,10 @@ else
# Presume $HOME/.kde is being used for KDE4 to be on the safe side.
export TDEHOME=$HOME/.trinity
fi
- elif [ -f /opt/trinity/bin/kde-config ]; then
+ elif [ -f /opt/trinity/bin/tde-config ]; then
# Looks like Trinity is installed.
export TDEHOME=$HOME/.trinity
- elif [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then
+ elif [ -f /usr/bin/tde-config ] && [ -d $HOME/.kde ]; then
# Looks like Trinity is installed and not playing second fiddle to KDE4.
export TDEHOME=$HOME/.kde
else
@@ -366,7 +366,7 @@ fi
# For anything else (that doesn't set env vars, or that needs a window manager),
# better use the Autostart folder.
-exepath=`kde-config --path exe | tr : '\n'`
+exepath=`tde-config --path exe | tr : '\n'`
for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
for file in "$prefix"*.sh; do
diff --git a/tdm/kfrontend/gentdmconf.c b/tdm/kfrontend/gentdmconf.c
index f55ffbbbc..b30a1a965 100644
--- a/tdm/kfrontend/gentdmconf.c
+++ b/tdm/kfrontend/gentdmconf.c
@@ -2578,7 +2578,7 @@ int main( int argc, char **argv )
" Default is to scan /etc/X11/tdm, $XLIBDIR/tdm, /etc/X11/xdm,\n"
" $XLIBDIR/xdm; there in turn look for tdm-config and xdm-config.\n"
" Note that you possibly need to use --no-old-kde to make this take effect.\n"
-" --old-kde /path/to/old/kde-config-dir\n"
+" --old-kde /path/to/old/tde-config-dir\n"
" Where to look for the tdmrc of an older tdm.\n"
" Default is to scan " KDE_CONFDIR " and\n"
" {/usr,/usr/local,{/opt,/usr/local}/{trinity,kde,kde2,kde1}}/share/config.\n"