Repository: incubator-eagle Updated Branches: refs/heads/master c752ed868 -> 4ba634d55
[EAGLE-535] Fix eagle-server.sh to support to run under windows bash like Cygwin https://issues.apache.org/jira/browse/EAGLE-535 Author: Hao Chen <h...@apache.org> Closes #431 from haoch/EAGLE-534. Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/4ba634d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/4ba634d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/4ba634d5 Branch: refs/heads/master Commit: 4ba634d551c16be6b2987940b2bfa359d126107f Parents: c752ed8 Author: Hao Chen <h...@apache.org> Authored: Fri Sep 9 18:37:10 2016 +0800 Committer: Hao Chen <h...@apache.org> Committed: Fri Sep 9 18:37:10 2016 +0800 ---------------------------------------------------------------------- eagle-server-assembly/src/main/bin/eagle-env.sh | 24 ++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/4ba634d5/eagle-server-assembly/src/main/bin/eagle-env.sh ---------------------------------------------------------------------- diff --git a/eagle-server-assembly/src/main/bin/eagle-env.sh b/eagle-server-assembly/src/main/bin/eagle-env.sh index b2c04f8..7c900ad 100644 --- a/eagle-server-assembly/src/main/bin/eagle-env.sh +++ b/eagle-server-assembly/src/main/bin/eagle-env.sh @@ -15,12 +15,28 @@ # See the License for the specific language governing permissions and # limitations under the License. -# set EAGLE_HOME +# EAGLE Environment Variables export EAGLE_HOME=$(dirname $0)/.. - export EAGLE_CLASSPATH=$EAGLE_HOME/conf +# System Environment Variables +export OS_TYPE="linux" +export CLASSPATH_DELIMITER=":" + +case `which uname >/dev/null && uname -s` in + CYGWIN_NT-*) + OS_TYPE="windows" + CLASSPATH_DELIMITER=";" + ;; + Linux) + OS_TYPE="linux" + ;; + *) + OS_TYPE="unknown" + ;; +esac + # Add eagle shared library jars -for file in `ls $EAGLE_HOME/lib`; do - EAGLE_CLASSPATH=$EAGLE_CLASSPATH:$EAGLE_HOME/lib/$file +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