diff options
| author | Dirk von Suchodoletz | 2008-12-17 17:04:54 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-12-17 17:04:54 +0100 |
| commit | 707eb1cdaef84318f7a464fef94fff26d09d2514 (patch) | |
| tree | 827d85efbc4851e159870f31a37be0374a700cff /os-plugins/plugins/x11vnc | |
| parent | Adding missing libraries as reported on the list. (diff) | |
| download | core-707eb1cdaef84318f7a464fef94fff26d09d2514.tar.gz core-707eb1cdaef84318f7a464fef94fff26d09d2514.tar.xz core-707eb1cdaef84318f7a464fef94fff26d09d2514.zip | |
More general location of helper functions (to check if a certain
binary is installed somewhere).
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2426 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/x11vnc')
| -rw-r--r-- | os-plugins/plugins/x11vnc/OpenSLX/Distro/Base.pm | 18 | ||||
| -rw-r--r-- | os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm | 22 |
2 files changed, 0 insertions, 40 deletions
diff --git a/os-plugins/plugins/x11vnc/OpenSLX/Distro/Base.pm b/os-plugins/plugins/x11vnc/OpenSLX/Distro/Base.pm index 11f0b2e5..93f1a3eb 100644 --- a/os-plugins/plugins/x11vnc/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/x11vnc/OpenSLX/Distro/Base.pm @@ -89,24 +89,6 @@ sub fillRunlevelScript return $script; } -sub pathOf -{ - my $self = shift; - my $binary = shift; - - return qx{which $binary 2>/dev/null}; -} - -sub isInPath -{ - my $self = shift; - my $binary = shift; - - my $path = $self->pathOf($binary); - - return $path ? 1 : 0; -} - sub isX11vncInstalled { my $self = shift; diff --git a/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm b/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm index 3c67b9f7..e73ea8a3 100644 --- a/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm +++ b/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm @@ -207,28 +207,6 @@ sub installationPhase vlog(3, "install init file"); - #if ( !-x "/usr/bin/x11vnc" ) { - # # let's install x11vnc - # my $vendorOSName = $self->{'os-plugin-engine'}->{'vendor-os-name'}; - # if ( $vendorOSName =~ m/(debian|ubuntu)/i ) { - # my $cmd = "aptitude -y install x11vnc"; - # vlog(3, "executing: $cmd"); - # if (slxsystem($cmd)) { - # die _tr("unable to execute shell-cmd\n\t%s", $cmd); - # } - # } - # if ( $vendorOSName =~ m/suse/i ) { - # # PLEASE TEST THIS!!! - # my $cmd = "zypper -n in x11vnc"; - # vlog(3, "executing: $cmd"); - # if (slxsystem($cmd)) { - # die _tr("unable to execute shell-cmd\n\t%s", $cmd); - # } - # } - #} else { - # vlog(3, "x11vnc is already installed"); - #} - } sub removalPhase |