From f6f7848eaa5bdd69e03608fc2b9898eab3ce599b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 10 Jul 2019 16:52:07 +0200
Subject: [run-virt/*] Make VIRTCMDOPTS an array for space safeness

---
 .../data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc  | 4 ----
 .../data/opt/openslx/vmchooser/plugins/vmware/run-virt.include        | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'core/modules/vmware-common')

diff --git a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc
index 2aba4cdf..8a71a21b 100644
--- a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc
+++ b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc
@@ -46,10 +46,6 @@ fi
 
 [ -n "$gmax" ] && maxhardwareversion="$gmax"
 
-# VMware start options
-# "-X": start in fullscreen
-declare -rg VM_START_OPTIONS="-X"
-
 # create vmware directories
 mkdir -p "$VM_REDO_DIR" >/dev/null 2>&1
 mkdir -p "$VM_CONF_DIR" >/dev/null 2>&1
diff --git a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include
index e98595b7..33d9de29 100644
--- a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include
+++ b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include
@@ -58,5 +58,6 @@ run_plugin() {
 	
 	# HACK: using the modified version of the wrapper script
 	declare -rg VIRTCMD="/opt/openslx/bin/vmplayer"
-	declare -rg VIRTCMDOPTS="${VM_START_OPTIONS} ${VM_RUN_FILE}"
+	# -X for fullscreen, plus VMX file
+	VIRTCMDOPTS+=( "-X" "${VM_RUN_FILE}" )
 }
-- 
cgit v1.2.3-55-g7522