kill more deploy

svn path=/java-config-ng/branches/axxo/; revision=195

4 files changed, 16 insertions, 7 deletions

diff --git a/java-config b/java-config
index 662a46b..98ada8c 100755
--- a/java-config
+++ b/java-config
@@ -120,20 +120,19 @@ def print_environment(option, opt, value, parser):
    """
    config = manager.get_vm(value).get_config()
    """
-   manager.create_env_entry(manager.get_vm(value), printer, "export %s=%s")
+   manager.create_env_entry(manager.get_vm(value), printer, "%s=%s")
 
 def set_system_vm(option, opt, value, parser):
    vm = manager.get_vm(value)
    # TODO: MAKE THIS MODULAR!!
    config = os.path.join('/', 'etc', 'env.d', '20java')
-   deploy = os.path.join('/', 'etc', '.java', '.deployment', 'deployment.properties')
 
    if os.getuid() is 0:
       if vm.is_jre():
          printer._printWarning("The specified VM is a JRE!  It is suggested you use a JDK!")
 
       try:
-         manager.set_vm(vm, config, None, deploy)
+         manager.set_vm(vm, config, None)
 
          # Update the profile which contains updates
          printer._print(getoutput("/usr/sbin/env-update"))
@@ -151,7 +150,6 @@ def set_user_vm(option, opt, value, parser):
    # TODO: MAKE THIS MODULAR!!
    config_sh = os.path.join(os.environ.get("HOME"), '.gentoo', 'java.sh')
    config_csh = os.path.join(os.environ.get("HOME"), '.gentoo', 'java.csh')
-   deploy = os.path.join(os.environ.get("HOME"), '.java', '.deployment', 'deployment.properties')
 
    if os.getuid() is 0:
       printer._printError("The user 'root' should always use the System VM")
@@ -163,7 +161,7 @@ def set_user_vm(option, opt, value, parser):
          printer._printError(os.path.join(os.environ.get("HOME"), '.gentoo') + " exists, but is not a directory!")
       else:
          try:
-            manager.set_vm(vm, config_sh, config_csh, deploy)
+            manager.set_vm(vm, config_sh, config_csh)
             printer._printAlert("If you want to use java in your current session, you should update\n\t   your environment by running:")
             printer._print("\t   %Hsource ~/.gentoo/java")
          except PermissionError:
diff --git a/run-java-tool b/run-java-tool
new file mode 100755
index 0000000..35a007c
--- /dev/null
+++ b/run-java-tool
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [[ -n ${GENTOO_VM} ]]; then
+	execme=/usr/share/java-config/vms/${GENTOO_VM}/
+elif [[ -d ${HOME}/.gentoo/user-vm ]]; then
+	execme=${HOME}/.gentoo/user-vm/
+else
+	execme=/usr/share/java-config/vms/system-vm/
+fi
+
+exec ${execme}/$(basename $0)
diff --git a/setup.py b/setup.py
index fa3d10d..f203b24 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ setup (
 	url = 'http://www.gentoo.org',
 	packages = ['java_config'],
 	package_dir = { 'java_config' : 'src' },
-	scripts = ['java-config','depend-java-query'],
+	scripts = ['java-config','depend-java-query','run-java-tool'],
 	data_files = [('man/man1', ["man/java-config.1"])]
 )
 
diff --git a/src/EnvironmentManager.py b/src/EnvironmentManager.py
index c83b7ad..a6734c3 100644
--- a/src/EnvironmentManager.py
+++ b/src/EnvironmentManager.py
@@ -155,7 +155,7 @@ class EnvironmentManager:
       except EnvironmentUndefinedError:
          raise EnvironmentUndefinedError
 
-   def set_vm(self, vm, sh_env_file, csh_env_file=None, deploy_file=None):
+   def set_vm(self, vm, sh_env_file, csh_env_file=None):
 
       # Create the SH environment file
       if sh_env_file is not None: