Repository: eagle
Updated Branches:
refs/heads/master b51453857 -> 06a828f08
[EAGLE-1082] The server script can't be started from the same directory
<!--
{% comment %}
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to you under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
{% endcomment %}
-->
Be sure to do all of the following to help us incorporate your contribution
quickly and easily:
- [ ] Make sure the PR title is formatted like:
`[EAGLE-<Jira issue #>] Description of pull request`
- [ ] Make sure tests pass via `mvn clean verify`. (Even better, enable
Travis-CI on your fork and ensure the whole test matrix passes).
- [ ] Replace `<Jira issue #>` in the title with the actual Jira issue
number, if there is one.
- [ ] If this contribution is large, please file an Apache
[Individual Contributor License
Agreement](https://www.apache.org/licenses/icla.txt).
---
Author: Colm O hEigeartaigh <[email protected]>
Closes #986 from coheigea/EAGLE-1082.
Project: http://git-wip-us.apache.org/repos/asf/eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/06a828f0
Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/06a828f0
Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/06a828f0
Branch: refs/heads/master
Commit: 06a828f0806900d0e740a4ca00b83a889044be7d
Parents: b514538
Author: Colm O hEigeartaigh <[email protected]>
Authored: Tue Feb 6 23:04:02 2018 -0800
Committer: Jay Sen <[email protected]>
Committed: Tue Feb 6 23:04:02 2018 -0800
----------------------------------------------------------------------
eagle-assembly/src/main/bin/eagle-env.sh | 4 ++--
eagle-assembly/src/main/bin/eagle-server.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/eagle/blob/06a828f0/eagle-assembly/src/main/bin/eagle-env.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-env.sh
b/eagle-assembly/src/main/bin/eagle-env.sh
index 892978b..ab2cc2c 100644
--- a/eagle-assembly/src/main/bin/eagle-env.sh
+++ b/eagle-assembly/src/main/bin/eagle-env.sh
@@ -18,7 +18,7 @@
export EAGLE_SERVER_JMX_PORT=9999
# EAGLE Environment Variables
-export EAGLE_HOME=$(dirname $0)/..
+export EAGLE_HOME=$(readlink -f $(dirname $0)/..)
export EAGLE_CLASSPATH=$EAGLE_HOME/conf
# System Environment Variables
@@ -41,4 +41,4 @@ esac
# Add eagle shared library jars
for file in `ls ${EAGLE_HOME}/lib`; do
EAGLE_CLASSPATH=${EAGLE_CLASSPATH}${CLASSPATH_DELIMITER}${EAGLE_HOME}/lib/$file
-done
\ No newline at end of file
+done
http://git-wip-us.apache.org/repos/asf/eagle/blob/06a828f0/eagle-assembly/src/main/bin/eagle-server.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-server.sh
b/eagle-assembly/src/main/bin/eagle-server.sh
index 4199234..fb8e54f 100644
--- a/eagle-assembly/src/main/bin/eagle-server.sh
+++ b/eagle-assembly/src/main/bin/eagle-server.sh
@@ -25,7 +25,7 @@ then
print_help
fi
-DIR=$(dirname $0)
+DIR=$(readlink -f $(dirname $0))
source ${DIR}/eagle-env.sh
