summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Janczyk2009-03-19 17:23:37 +0100
committerMichael Janczyk2009-03-19 17:23:37 +0100
commit22dcaf4194e5c559c6a6b428c13f024fc507f19f (patch)
treea5a383396cc3c02410b01ad97e6249b8c6d4099b
parentBoot timer output added (debug level 8) ... (diff)
downloadcore-22dcaf4194e5c559c6a6b428c13f024fc507f19f.tar.gz
core-22dcaf4194e5c559c6a6b428c13f024fc507f19f.tar.xz
core-22dcaf4194e5c559c6a6b428c13f024fc507f19f.zip
removed old set KDEHOME for Ubuntu and stubs. Not needed anymore
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2741 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm7
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Gentoo.pm7
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm5
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm5
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm23
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm2
6 files changed, 0 insertions, 49 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm
index 0b7fe73e..e8f5b944 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm
@@ -56,11 +56,4 @@ sub setupKDMScript
return $script;
}
-sub setupKDEHOME
-{
- print "Info: KDEHOME isn't set for Debian at this point.\n";
-
- return;
-}
-
1;
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Gentoo.pm
index 4a8fe413..129f4d08 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Gentoo.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Gentoo.pm
@@ -27,11 +27,4 @@ use OpenSLX::Basics;
# TODO: implement!
-sub setupKDEHOME
-{
- print "Info: KDEHOME isn't set for Gentoo at this point.\n";
-
- return;
-}
-
1;
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
index ef31391a..101e1c73 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
@@ -104,11 +104,6 @@ sub setupKDMScript
return $script;
}
-sub setupKDEHOME
-{
- return;
-}
-
sub _setupCommonDmScript
{
my $script = shift;
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
index 1a3efc85..b5c340f6 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
@@ -114,11 +114,6 @@ sub setupKDMScript
return $script;
}
-sub setupKDEHOME
-{
- return;
-}
-
sub _setupCommonDmScript
{
my $script = shift;
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index 160c1679..93e20bb9 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -144,27 +144,4 @@ sub setupKDMScript
return $script;
}
-sub setupKDEHOME
-{
- my $self = shift;
- my $path = "/etc/profile.d/kde.sh";
-
- my $script = unshiftHereDoc(<<' End-of-Here');
- export KDEHOME=".kde$(kde-config -v | grep KDE | \
- sed -e "s,KDE: \([0-9]\).*,\1,")-ubuntu"
- End-of-Here
-
- appendFile($path, $script);
- # TODO: a nicer solution to this hack
- # ensures, that .kde-.../share/apps directory exists
- # otherwise KDE progs will complain every time with a warning window
- system('! [ -e /usr/bin/startkde ] || \
- grep -q "mkdir -m 700 -p \$kdehome/share/apps" /usr/bin/startkde ||\
- sed -i -e "s,mkdir -m 700 -p \$kdehome/share/config,\
-mkdir -m 700 -p \$kdehome/share/config\nmkdir -m 700 -p \$kdehome/share/apps," \
- /usr/bin/startkde');
-
- return;
-}
-
1;
diff --git a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
index bd1d607b..dc53f3a1 100644
--- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
@@ -400,8 +400,6 @@ sub installationPhase
}
$self->_setupSupportedThemes();
- $self->{distro}->setupKDEHOME();
-
return;
}