Merge branch '19136-freeze-props-whitelist'

[arvados.git] / tools / arvbash / arvbash.sh

diff --git a/tools/arvbash/arvbash.sh b/tools/arvbash/arvbash.sh
index c2785c498c22a7569d5b1c5e2e9e89a6fc014a27..1d4fbade8b7534b5bb05d1e8a0b8f2f121e754a0 100755 (executable)
--- a/tools/arvbash/arvbash.sh
+++ b/tools/arvbash/arvbash.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 # bash functions for managing Arvados tokens and other conveniences.
 
 read -rd "\000" helpmessage <<EOF
@@ -11,10 +15,10 @@ Syntax:
 arvswitch <name>
   Set ARVADOS_API_HOST and ARVADOS_API_TOKEN in the current environment based on
   $HOME/.config/arvados/<name>.conf
-  With no arguments, list available Arvados configurations.
+  With no arguments, print current API host and available Arvados configurations.
 
 arvsave <name>
-  Save values of ARVADOS_API_HOST and ARVADOS_API_TOKEN in the current environment to
+  Save current values of ARVADOS_API_HOST and ARVADOS_API_TOKEN in the current environment to
   $HOME/.config/arvados/<name>.conf
 
 arvrm <name>
@@ -22,12 +26,12 @@ arvrm <name>
 
 arvboxswitch <name>
   Set ARVBOX_CONTAINER to <name>
-  With no arguments, list available arvboxes.
+  With no arguments, print current arvbox and available arvboxes.
 
-arvopen:
-  Open an Arvados uuid in web browser (http://curover.se)
+arvopen <uuid>
+  Open an Arvados uuid in web browser (http://arvadosapi.com)
 
-arvissue
+arvissue <issue number>
   Open an Arvados ticket in web browser (http://dev.arvados.org)
 
 EOF
@@ -57,7 +61,8 @@ arvswitch() {
         fi
     else
         echo "Switch Arvados environment conf"
-        echo "Usage: arvswitch name"
+       echo "Current host: ${ARVADOS_API_HOST}"
+        echo "Usage: arvswitch <name>"
         echo "Available confs:" $((cd $HOME/.config/arvados && ls --indicator-style=none *.conf) | rev | cut -c6- | rev)
     fi
 }
@@ -69,7 +74,7 @@ arvsave() {
         env | grep ARVADOS_ > $HOME/.config/arvados/$1.conf
     else
         echo "Save current Arvados environment variables to conf file"
-        echo "Usage: arvsave name"
+        echo "Usage: arvsave <name>"
     fi
 }
 
@@ -82,35 +87,35 @@ arvrm() {
         fi
     else
         echo "Delete Arvados environment conf"
-        echo "Usage: arvrm name"
+        echo "Usage: arvrm <name>"
     fi
 }
 
 arvboxswitch() {
     if [[ -n "$1" ]] ; then
+        export ARVBOX_CONTAINER=$1
         if [[ -d $HOME/.arvbox/$1 ]] ; then
-            export ARVBOX_CONTAINER=$1
             echo "Arvbox switched to $1"
         else
-            echo "$1 unknown"
+            echo "Warning: $1 doesn't exist, will be created."
         fi
     else
         if test -z "$ARVBOX_CONTAINER" ; then
             ARVBOX_CONTAINER=arvbox
         fi
         echo "Switch Arvbox environment conf"
-        echo "Usage: arvboxswitch name"
         echo "Your current container is: $ARVBOX_CONTAINER"
+        echo "Usage: arvboxswitch <name>"
         echo "Available confs:" $(cd $HOME/.arvbox && ls --indicator-style=none)
     fi
 }
 
 arvopen() {
     if [[ -n "$1" ]] ; then
-        xdg-open https://curover.se/$1
+        xdg-open https://arvadosapi.com/$1
     else
         echo "Open Arvados uuid in browser"
-        echo "Usage: arvopen uuid"
+        echo "Usage: arvopen <uuid>"
     fi
 }
 
@@ -119,6 +124,6 @@ arvissue() {
         xdg-open https://dev.arvados.org/issues/$1
     else
         echo "Open Arvados issue in browser"
-        echo "Usage: arvissue uuid"
+        echo "Usage: arvissue <issue number>"
     fi
 }