aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2011-12-13 20:39:30 +0000
committerRalph Sennhauser <sera@gentoo.org>2011-12-13 20:39:30 +0000
commitf1f228abc49404a6f45d56c5a6a9f69c3f9e0e93 (patch)
tree53ac84b11112771766c458d53d36b303eac545e6
parentUse optional VMHANDLE argument for eselect java-vm update (diff)
downloadjava-config-generation3-support.tar.gz
java-config-generation3-support.tar.bz2
java-config-generation3-support.zip
Clean up output of java-config --helpgeneration3-support
svn path=/projects/java-config-2/branches/generation3-support/; revision=8921
-rwxr-xr-xsrc/java-config-219
1 files changed, 8 insertions, 11 deletions
diff --git a/src/java-config-2 b/src/java-config-2
index c3549d1..b79dd57 100755
--- a/src/java-config-2
+++ b/src/java-config-2
@@ -369,6 +369,9 @@ if __name__ == '__main__':
action="callback", callback=select_vm,
type="string", dest="vm",
help="Use this vm instead of the active vm when returning information")
+ parser.add_option("-n", "--nocolor",
+ action="callback", callback=nocolor,
+ help="Disable color output")
# Queries
group = OptionGroup(parser, "Queries")
@@ -384,6 +387,9 @@ if __name__ == '__main__':
group.add_option("-t", "--tools",
action="callback", callback=tools,
help="Print the path to tools.jar")
+ group.add_option("-O", "--java-home",
+ action="callback", callback=query_active_vm_cb, callback_args=("JAVA_HOME",),
+ help="Print the location of the active JAVA_HOME")
group.add_option("-f", "--show-active-vm",
action="callback", callback=show_active_vm,
help="Print the active Virtual Machine")
@@ -437,9 +443,6 @@ if __name__ == '__main__':
action="callback", callback=get_virtual_providers,
type="string", dest="package(s)",
help="Return a list of packages that provide a virtual")
- group.add_option("--java-home",
- action="callback", callback=query_active_vm_cb, callback_args=("JAVA_HOME",),
- help="Print the location of the active JAVA_HOME")
group.add_option("--print-jdks",
action="callback", callback=print_jdks,
help="Print a list of available jdks")
@@ -454,10 +457,7 @@ if __name__ == '__main__':
# Deprecated
group = OptionGroup(parser, "Deprecated",
- "Those options have alternatives and nocolor will become the default")
- group.add_option("-n", "--nocolor",
- action="callback", callback=nocolor,
- help="Disable color output")
+ "The prefered way to querry and set the vm is with eselect java-vm")
group.add_option("-L", "--list-available-vms",
action="callback", callback=list_available_vms,
help="List available Java Virtual Machines")
@@ -469,10 +469,7 @@ if __name__ == '__main__':
action="callback", callback=set_user_vm,
type="string", dest="vm",
help="Set the default Java VM for the user")
- group.add_option("-O", "--jdk-home",
- action="callback", callback=query_active_vm_cb, callback_args=("JAVA_HOME",),
- help="Print the location of the active JAVA_HOME")
- group.add_option("-o", "--jre-home",
+ group.add_option("-o", "--jre-home", "--jdk-home",
action="callback", callback=query_active_vm_cb, callback_args=("JAVA_HOME",),
help="Print the location of the active JAVA_HOME")