Tiny changes to the export script.

diff --git a/tools/nd_exportappliance b/tools/nd_exportappliance
index b9bc6ad2ab621db856d1d5f6383ce380863b2051..b48a92a6e18d6156ea73ec3f89d51e86e1b56b29 100755 (executable)
--- a/tools/nd_exportappliance
+++ b/tools/nd_exportappliance
@@ -4,24 +4,24 @@ set -e
 set -u
 
 # Settings/arguments
-vm_name="NeuroDebian VirtualMachine (64bit)"
+vendor="NeuroDebian"
 vm_version="6.0.0"
 vm_arch="amd64"
+vm_name="${vendor} ${vm_version} (${vm_arch})"
+product_name="${vendor} VirtualMachine (${vm_arch})"
 outdir=.
 
 # Common
-eula="Virtual appliance comes with Free and Open Source Software (FOSS) released under licenses compliant with Debian Free Software Guidelines (DFSG, see http://www.debian.org/social_contract), such as, GPL, BSD, MIT, etc.  Such software is free to be used or customized for any purpose.
+eula="This virtual appliance contains Free and Open Source Software (FOSS) released under licenses compliant with the Debian Free Software Guidelines (DFSG, see http://www.debian.org/social_contract), such as, GPL, BSD, MIT, etc.  Such software is free to be used or customized for any purpose.
 
-In addition, Debian and NeuroDebian contrib/ and non-free/ repositories are enabled within the Virtual Machine to provide you with access to free software which is distributed under restrictive (e.g. closed-source, non-commercial, research-only) licenses.
+However, by default this virtual machine is also enabled to install additional software from Debian and NeuroDebian repositories that is distributed under more restrictive licenses (e.g. closed-source, non-commercial, research-only). It is the user's responsibility to adhere to the terms and conditions of any particular software that is installed and used in this virtual machine. Copyright and license details for any installed PACKAGE are available in /usr/share/doc/PACKAGE/copyright inside the virtual machine."
 
-You must adhere to the terms of FOSS or free software you will use.  For copyright and license details of a particular software shipped in a PACKAGE please consult a corresponding /usr/share/doc/PACKAGE/copyright file before its use."
-
-out_ovf="${outdir}/NeuroDebian_${vm_version}_${vm_arch}.ovf"
+out_ovf="${outdir}/${vendor}_${vm_version}_${vm_arch}.ovf"
 VBoxManage export "${vm_name}" -o "$out_ovf" \
        --vsys 0 \
        --product "$vm_name" \
        --producturl "http://neuro.debian.net/vm.html" \
-       --vendor "NeuroDebian" \
+       --vendor "${vendor}" \
        --vendorurl "http://neuro.debian.net" \
        --version "$vm_version" \
        --eula "$eula"