From 5c4d30c3213980c50f9abda451ae2ba0ad9dde2e Mon Sep 17 00:00:00 2001
From: Bastian Wissler
Date: Thu, 16 Oct 2008 14:00:04 +0000
Subject: xserver fix: * linkage.sh does not run with ubuntu dash shell.

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2333 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'os-plugins/plugins')

diff --git a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm
index 1a8de27f..8bf6b8e3 100644
--- a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm
@@ -228,18 +228,18 @@ sub installationPhase
         copyFile("$pluginFilesPath/ubuntu-gfx-install.sh", "$installationPath");
         copyFile("$pluginFilesPath/suse-gfx-install.sh", "$installationPath");
         copyFile("$pluginFilesPath/linkage.sh", "$installationPath");
-        # be on the safe side
-        system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh clean");
+        # be on the safe side (BASH) - Ubuntu sets some crazy stupid 'dash' shell otherwise
+        system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh clean");
     }
     if ($attrs->{'xserver::ati'} == 1) {
         copyFile("$pluginFilesPath/ati-install.sh", "$installationPath");
-        system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/ati-install.sh");
-        system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh ati");
+        system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/ati-install.sh");
+        system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh ati");
     }
     if ($attrs->{'xserver::nvidia'} == 1) {
         copyFile("$pluginFilesPath/nvidia-install.sh", "$installationPath");
-        system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/nvidia-install.sh");
-        system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh nvidia");
+        system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/nvidia-install.sh");
+        system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh nvidia");
     }
 
     # Some plugins have to copy files from their plugin folder into the
-- 
cgit v1.2.3-55-g7522