summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk von Suchodoletz2008-12-16 21:48:16 +0100
committerDirk von Suchodoletz2008-12-16 21:48:16 +0100
commit0f7fb84c271dce40d41c87e3cac6d07fcf6f2b87 (patch)
tree46ac2ee1dc71b463290ddf1bfb8dc8f3c7ba6c7b
parentFirst steps to [wiki:x11vnc x11vnc] extension, see #281. (diff)
downloadcore-0f7fb84c271dce40d41c87e3cac6d07fcf6f2b87.tar.gz
core-0f7fb84c271dce40d41c87e3cac6d07fcf6f2b87.tar.xz
core-0f7fb84c271dce40d41c87e3cac6d07fcf6f2b87.zip
Fixes to r2409 ... Please check!
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2410 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--os-plugins/plugins/x11vnc/OpenSLX/Distro/Base.pm27
1 files changed, 24 insertions, 3 deletions
diff --git a/os-plugins/plugins/x11vnc/OpenSLX/Distro/Base.pm b/os-plugins/plugins/x11vnc/OpenSLX/Distro/Base.pm
index 1a1d08c5..11f0b2e5 100644
--- a/os-plugins/plugins/x11vnc/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/x11vnc/OpenSLX/Distro/Base.pm
@@ -18,6 +18,8 @@ use warnings;
our $VERSION = 1.01; # API-version . implementation-version
+use File::Basename;
+
use OpenSLX::Basics;
use OpenSLX::Utils;
@@ -29,13 +31,12 @@ sub new
my $class = shift;
my $self = {};
return bless $self, $class;
-
}
sub initialize
{
my $self = shift;
- my $engine = shift;
+ $self->{engine} = shift;
return 1;
}
@@ -88,6 +89,24 @@ 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;
@@ -97,7 +116,9 @@ sub isX11vncInstalled
sub installX11vnc
{
my $self = shift;
- $self->{engine}->installPackages('x11vnc');
+ $self->{engine}->installPackages(
+ $self->{engine}->getInstallablePackagesForSelection('x11vnc')
+ );
return 1;
}