From 287ab7dd09047fef562bce3e548dd548a3b3a3f7 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 12 Oct 2015 11:29:11 +0200
Subject: [vmware] Bump version to player 12.0.0

---
 .../includes/create_vmhome_preferences_file.inc       | 19 +++++++++++++------
 .../opt/openslx/vmchooser/vmware/includes/logging.inc |  2 +-
 .../vmware/includes/set_vmware_include_variables.inc  |  8 +++-----
 3 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'remote/modules/vmware/data')

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc
index 9e156951..64d525a1 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc
@@ -3,16 +3,20 @@ create_vmhome_preferences_file() {
 		.encoding = "UTF-8"
 		# This configuration file was generated by $0
 		
-		# updates/tips
+		# updates
 		webUpdate.enabled = "FALSE"
 		webUpdate.lastCheck.status = "done_updates"
-		webUpdate.checkPeriod = "manual"
-		pref.downloadPermission = "deny"
-		pref.vmplayer.downloadPermission = "deny"
+		webUpdate.checkPeriod = "never"
+		pref.downloadPermission = "DENY"
+		pref.vmplayer.downloadPermission = "DENY"
 		pref.vmplayer.webUpdateOnStartup = "FALSE"
+		pref.autoSoftwareUpdatePermission = "DENY"
+		pref.lastUpdateCheckSec = "$(date +%s)"
+		# hints
 		pref.tip.startup = "FALSE"
 		hints.hideAll = "TRUE"
 		hint.vmui.showAllUSBDevs = "FALSE"
+		hint.usb.disconnectHostdriver = "FALSE"
 		
 		# configs
 		prefvmx.defaultVMPath = "$vmhome"
@@ -39,16 +43,19 @@ create_vmhome_preferences_file() {
 		pref.autoFitGuestToWindow = "TRUE"
 		pref.vmplayer.exit.vmAction = "poweroff"
 		pref.vmplayer.confirmOnExit = "TRUE"
+		pref.backgroundOnClose = "FALSE"
+		pref.trayicon.enabled = "FALSE"
 		
 		# shared folders
 		pref.enableAllSharedFolders = "TRUE"
 		
 		# eula
+		pref.vmplayer.firstRunDismissedVersion = "$vmware_version"
 		pref.eula.count = "2"
 		pref.eula0.product = "VMware Player"
-		pref.eula0.build = "$vmbuild"
+		pref.eula0.build = "$vmware_build"
 		pref.eula1.product = "VMware Workstation"
-		pref.eula1.build = "$vmbuild"
+		pref.eula1.build = "$vmware_build"
 	HEREEND
 	writelog "Vmware preferences file created in vmhome."
 }
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc
index 62b1c691..9d113479 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc
@@ -4,7 +4,7 @@
 
 logging() {
 	# log script information
-	writelog "# File created by $0 (VMversion ${vmversion})\n# on $(date)\n"
+	writelog "# File created by $0 (VMware version ${vmware_version})\n# on $(date)\n"
 	## Edited for persistent mode.
 	writelog "Starting with ${diskmode} mode ...\n"
 	##
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_vmware_include_variables.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_vmware_include_variables.inc
index 78f8c634..5a5d1132 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_vmware_include_variables.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_vmware_include_variables.inc
@@ -17,10 +17,10 @@ set_vmware_include_variables() {
 	fi
 	
 	# temporary disk space for logs, etc...
-	redodir=/tmp/virt/vmware/${USER}.$$
+	redodir="/tmp/virt/vmware/${USER}.$$"
 	
 	# dir for configs and vmem file
-	confdir=/tmp/virt/vmware/${USER}.$$
+	confdir="/tmp/virt/vmware/${USER}.$$"
 	
 	# configfile
 	conffile="${confdir}/run-vmware.conf"
@@ -29,13 +29,11 @@ set_vmware_include_variables() {
 	diskfile="${vmpath}"
 	
 	# users vmware config folder
-	[ -z "${HOME}" ] && HOME=$(getent passwd "$(/usr/bin/whoami)" | awk -F ':' '{print $6}')
+	[ -z "${HOME}" ] && HOME=$(getent passwd "$(whoami)" | awk -F ':' '{print $6}')
 	vmhome="${HOME}/.vmware"
 	
 	# get several version infos for vmware/player
 	source /opt/openslx/vmchooser/vmware/vmware.conf
-	vmbuild=$buildversion
-	vmversion=$version
 	
 	# VMware start options
 	# "-X": start in fullscreen
-- 
cgit v1.2.3-55-g7522