From da1e96c047c46909bd1a1d3d938c86727e6052b8 Mon Sep 17 00:00:00 2001
From: thaibault
Date: Fri, 9 Aug 2013 15:46:45 +0200
Subject: Make script more compatible to different shell versions.

---
 .../vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
index a9a57ec9..3e0ee42d 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
@@ -44,9 +44,12 @@ function handlePersistentVM() {
     local imagePath="${SLX_VM_PERSISTENT_PATH}${imageName}"
     local persistentConfigVersionFilePath="$(mktemp --directory)/$(basename \
         "$1")" && \
-    bash "$(dirname "$0")/vmchooser-clc" "$1" \
-        "$persistentConfigVersionFilePath" --create-persistent-config \
-        "$imagePath" && \
+    local vmchooserFilePath="$(dirname "$0")/vmchooser-clc" && \
+    if [ ! -f "$vmchooserFilePath" ]; then
+        vmchooserFilePath='/opt/openslx/plugin-repo/vmchooser/vmchooser-clc'
+    fi
+    bash "$vmchooserFilePath" "$1" "$persistentConfigVersionFilePath" \
+        --create-persistent-config "$imagePath" && \
     echo "$persistentConfigVersionFilePath"
   fi
 }
-- 
cgit v1.2.3-55-g7522