diff options
author | Ashlee Young <ashlee@onosfw.com> | 2015-10-09 18:32:44 -0700 |
---|---|---|
committer | Ashlee Young <ashlee@onosfw.com> | 2015-10-09 18:32:44 -0700 |
commit | 6a07d2d622eaa06953f3353e39c080984076e8de (patch) | |
tree | bfb50a2090fce186c2cc545a400c969bf2ea702b /framework/src/onos/tools/dev | |
parent | e6d71622143ff9b2421a1abbe8434b954b5b1099 (diff) |
Updated master to commit id 6ee8aa3e67ce89908a8c93aa9445c6f71a18f986
Change-Id: I94b055ee2f298daf71e2ec794fd0f2495bd8081f
Diffstat (limited to 'framework/src/onos/tools/dev')
-rw-r--r-- | framework/src/onos/tools/dev/bash_profile | 70 | ||||
-rwxr-xr-x | framework/src/onos/tools/dev/bin/onos-create-app | 2 | ||||
-rw-r--r-- | framework/src/onos/tools/dev/header.txt | 2 |
3 files changed, 37 insertions, 37 deletions
diff --git a/framework/src/onos/tools/dev/bash_profile b/framework/src/onos/tools/dev/bash_profile index 5e161ccd..f39c2ce1 100644 --- a/framework/src/onos/tools/dev/bash_profile +++ b/framework/src/onos/tools/dev/bash_profile @@ -148,41 +148,41 @@ function nuke { spy "$@" | cut -c7-11 | xargs kill } -# Edit a cell file by providing a cell name. Opens the cell file in $EDITOR. -function vicell() { - local apply=false - local create=false - local cdf="" - local cpath="${ONOS_ROOT}/tools/test/cells/" - - if [ -z "$1" ] || [ "$1" = "-h" ] ; then - printf "usage: vicell [file] [options]\n\noptions:\n" - printf "\t-a: apply the cell after editing\n" - printf "\t-e: [editor] set EDITOR to [editor] (default *vi*)\n" - printf "\t-c: create cell file if none exist\n\n" - return 1 - fi - - while [ $# -gt 0 ]; do - case "$1" in - -a) apply=true ;; - -e) EDITOR=$2; shift ;; - -c) create=true ;; - *) cdf="$1" ;; - esac - shift - done - - if [ ! -e "${cpath}${cdf}" ] && [ "$create" = "false" ]; then - printf "${cdf} : no such cell\n" && return 1 - fi - - if [ -z "${EDITOR}" ] || [ -x "$(which ${EDITOR})" ]; then - unset EDITOR && vi ${cpath}${cdf} - else - $EDITOR ${cpath}${cdf} - fi - ($apply) && cell ${cdf} +# Edit a cell file by providing a cell name; opens the cell file in $EDITOR. +function vicell { + local apply=false + local create=false + local cdf="" + local cpath="${ONOS_ROOT}/tools/test/cells/" + + if [ -z "$1" ] || [ "$1" = "-h" ] ; then + printf "usage: vicell [file] [options]\n\noptions:\n" + printf "\t-a: apply the cell after editing\n" + printf "\t-e: [editor] set EDITOR to [editor] (default *vi*)\n" + printf "\t-c: create cell file if none exist\n\n" + return 1 + fi + + while [ $# -gt 0 ]; do + case "$1" in + -a) apply=true ;; + -e) EDITOR=$2; shift ;; + -c) create=true ;; + *) cdf="$1" ;; + esac + shift + done + + if [ ! -e "${cpath}${cdf}" ] && [ "$create" = "false" ]; then + printf "${cdf} : no such cell\n" && return 1 + fi + + if [ -z "${EDITOR}" ] || [ -x "$(which ${EDITOR})" ]; then + unset EDITOR && vi ${cpath}${cdf} + else + $EDITOR ${cpath}${cdf} + fi + ($apply) && cell ${cdf} } # autocomplete for certain utilities diff --git a/framework/src/onos/tools/dev/bin/onos-create-app b/framework/src/onos/tools/dev/bin/onos-create-app index 65b00b65..454bcd6e 100755 --- a/framework/src/onos/tools/dev/bin/onos-create-app +++ b/framework/src/onos/tools/dev/bin/onos-create-app @@ -11,7 +11,7 @@ type=${1:-bundle} [ $type = app ] && archetype=bundle || archetype=$type if [ "$1" = "-?" -o "$1" = "-h" -o "$1" = "--help" ]; then - echo "usage: $(basename $0) {app|bundle|ui|cli|api} groupId artifactId version package mvn-options" + echo "usage: $(basename $0) {app|bundle|ui|uitab|uitopo|cli|api} groupId artifactId version package mvn-options" echo " All arguments are optional" exit 1 fi diff --git a/framework/src/onos/tools/dev/header.txt b/framework/src/onos/tools/dev/header.txt index 6c18c92c..5b9dcb84 100644 --- a/framework/src/onos/tools/dev/header.txt +++ b/framework/src/onos/tools/dev/header.txt @@ -1,4 +1,4 @@ -Copyright $today.year Open Networking Laboratory +Copyright 2014-$today.year Open Networking Laboratory Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. |