X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fsample%2Fbin%2Fservice.sh;h=2b964b1c26df0978ab6bef406cd8e110a5d5dd68;hb=27afb0201ce717c25d8ffcc50f8b4972fc98f5c5;hp=75d658d177a93a6c620c0585a25b7c4d2b91ace4;hpb=3505a52ac853c134ecaf40f2977667de8770ec59;p=aaf%2Fauthz.git diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh index 75d658d1..2b964b1c 100644 --- a/auth/sample/bin/service.sh +++ b/auth/sample/bin/service.sh @@ -32,6 +32,7 @@ CONFIG=/opt/app/aaf_config JAVA_CADI="$JAVA -cp $CONFIG/bin/aaf-auth-cmd-*-full.jar org.onap.aaf.cadi.CmdLine" JAVA_AGENT="$JAVA -cp $CONFIG/bin/aaf-auth-cmd-*-full.jar -Dcadi_prop_files=$LOCAL/org.osaaf.aaf.props org.onap.aaf.cadi.configure.Agent" JAVA_AAFCLI="$JAVA -cp $CONFIG/bin/aaf-auth-cmd-*-full.jar -Dcadi_prop_files=$LOCAL/org.osaaf.aaf.props org.onap.aaf.auth.cmd.AAFcli" +JAVA_AAFBATCH="$JAVA -Dcadi_prop_files=$LOCAL/org.osaaf.aaf.batch.props -jar $CONFIG/bin/aaf-auth-batch-*-full.jar" # If doesn't exist... still create mkdir -p $OSAAF @@ -43,12 +44,13 @@ mkdir -p /opt/app/aaf/status FILE= # Setup Bash, first time only -if [ ! -e "$HOME/.bash_aliases" ] || [ -z "$(grep cadi $HOME/.bash_aliases)" ]; then - echo "alias cadi='$JAVA_CADI \$*'" >>$HOME/.bash_aliases - echo "alias agent='$CONFIG/bin/agent.sh \$*'" >>$HOME/.bash_aliases - echo "alias aafcli='$JAVA_AAFCLI \$*'" >>$HOME/.bash_aliases +if [ ! -e "$HOME/.bashrc" ] || [ -z "$(grep cadi $HOME/.bashrc)" ]; then + echo "alias cadi='$JAVA_CADI \$*'" >>$HOME/.bashrc + echo "alias agent='$CONFIG/bin/agent.sh \$*'" >>$HOME/.bashrc + echo "alias aafcli='$JAVA_AAFCLI \$*'" >>$HOME/.bashrc + echo "alias batch='$JAVA_AAFBATCH \$*'" >>$HOME/.bashrc chmod a+x $CONFIG/bin/agent.sh - . $HOME/.bash_aliases + . $HOME/.bashrc fi # Only load Identities once @@ -134,9 +136,6 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then for P in `env`; do if [[ "$P" == aaf_locator* ]]; then echo "$P" >> ${TMP} - if [[ "$P" == aaf_locator_container=* ]]; then - echo aaf_locator_container.hostname=${HOSTNAME} >> ${TMP} - fi fi done