diff options
| author | thaibault | 2013-08-09 15:46:45 +0200 |
|---|---|---|
| committer | torben | 2013-08-09 15:46:45 +0200 |
| commit | da1e96c047c46909bd1a1d3d938c86727e6052b8 (patch) | |
| tree | d25af9723cb9b3a6da365e4ac1351702f50efce5 /remote/modules/vmchooser/data | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-da1e96c047c46909bd1a1d3d938c86727e6052b8.tar.gz tm-scripts-da1e96c047c46909bd1a1d3d938c86727e6052b8.tar.xz tm-scripts-da1e96c047c46909bd1a1d3d938c86727e6052b8.zip | |
Make script more compatible to different shell versions.
Diffstat (limited to 'remote/modules/vmchooser/data')
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter | 9 |
1 files changed, 6 insertions, 3 deletions
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 } |