Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refine Local Agent.sh use
[aaf/authz.git]
/
auth
/
docker
/
agent.sh
diff --git
a/auth/docker/agent.sh
b/auth/docker/agent.sh
index
7e7d08c
..
4be485b
100644
(file)
--- a/
auth/docker/agent.sh
+++ b/
auth/docker/agent.sh
@@
-127,13
+127,13
@@
function run_it() {
function sso {
if [ -n "$2" ]; then
function sso {
if [ -n "$2" ]; then
- echo "$1=$2" >>
~
/.aaf/sso.props
+ echo "$1=$2" >>
$HOME
/.aaf/sso.props
fi
}
function reset_sso {
mkdir -p ~/.aaf
fi
}
function reset_sso {
mkdir -p ~/.aaf
- >
~
/.aaf/sso.props
+ >
$HOME
/.aaf/sso.props
sso aaf_locate_url "https://$AAF_FQDN:8095"
sso cadi_latitude "$LATITUDE"
sso cadi_longitude "$LONGITUDE"
sso aaf_locate_url "https://$AAF_FQDN:8095"
sso cadi_latitude "$LATITUDE"
sso cadi_longitude "$LONGITUDE"
@@
-160,9
+160,9
@@
case "$1" in
shift
reset_sso
if [ -f aaf-auth-cmd-$VERSION*-full.jar ]; then
shift
reset_sso
if [ -f aaf-auth-cmd-$VERSION*-full.jar ]; then
- java -Dcadi_prop_files="
~\/.aaf\
/sso.props" -jar aaf-auth-cmd-$VERSION*-full.jar $@
+ java -Dcadi_prop_files="
$HOME/.aaf
/sso.props" -jar aaf-auth-cmd-$VERSION*-full.jar $@
else
else
- echo "For local use, you need to have 'aaf-
cadi-aaf
-$VERSION*-full.jar' (or newer)"
+ echo "For local use, you need to have 'aaf-
auth-cmd
-$VERSION*-full.jar' (or newer)"
fi
;;
local)
fi
;;
local)
@@
-186,8
+186,7
@@
case "$1" in
sso aaf_id "$DEPLOY_FQI"
sso aaf_password "$DEPLOY_PASSWORD"
if [ -f aaf-auth-cmd-$VERSION*-full.jar ]; then
sso aaf_id "$DEPLOY_FQI"
sso aaf_password "$DEPLOY_PASSWORD"
if [ -f aaf-auth-cmd-$VERSION*-full.jar ]; then
- mkdir -p $APP_FQDN
- java -Dcadi_prop_files="~\/.aaf\/sso.props" -cp aaf-auth-cmd-$VERSION*-full.jar org.onap.aaf.cadi.configure.Agent $CMD
+ java -Dcadi_prop_files="$HOME/.aaf/sso.props" -cp aaf-auth-cmd-$VERSION*-full.jar org.onap.aaf.cadi.configure.Agent $CMD
else
echo "For local use, you need to have 'aaf-cadi-aaf-$VERSION*-full.jar' (or newer)"
fi
else
echo "For local use, you need to have 'aaf-cadi-aaf-$VERSION*-full.jar' (or newer)"
fi