[BZ 1153373] RHQ fails to do dev startup after new install on Mac OS/X .

I fixed the rhq-agent* scripts as these are the minimal changes to make a rhq install work. Any more changes represent risk especially at this late stage in JON release. (cherry picked from commit 04fd135) Signed-off-by: John Mazzitelli <mazz@redhat.com>
rhq-project · Oct 21, 2014 · 284763e · 284763e
1 parent afc5a92
commit 284763e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh b/modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh
@@ -148,8 +148,12 @@ else
     # only certain platforms support the -e argument for readlink
     if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then
        _READLINK_ARG="-e"
+       _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"`
+    elif  [ -n "${_DARWIN}" ]; then
+       _DOLLARZERO=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)/`basename "${BASH_SOURCE[0]}"`
+    else
+       _DOLLARZERO=`readlink "$0" 2>/dev/null || echo "$0"`
     fi
-    _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"`
 fi
 
 

diff --git a/modules/enterprise/agent/src/etc/rhq-agent.sh b/modules/enterprise/agent/src/etc/rhq-agent.sh
@@ -89,10 +89,14 @@ if [ $? -ne 0 ]; then
     _DOLLARZERO="$0"
 else
     # only certain platforms support the -e argument for readlink
-    if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then
+     if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then
        _READLINK_ARG="-e"
+       _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"`
+    elif  [ -n "${_DARWIN}" ]; then
+       _DOLLARZERO=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)/`basename "${BASH_SOURCE[0]}"`
+    else
+       _DOLLARZERO=`readlink "$0" 2>/dev/null || echo "$0"`
     fi
-    _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"`
 fi
 
 RHQ_AGENT_BIN_DIR_PATH=`dirname "$_DOLLARZERO"`

diff --git a/modules/enterprise/agent/src/etc/standalone-pc.sh b/modules/enterprise/agent/src/etc/standalone-pc.sh
@@ -7,7 +7,15 @@ if [ $? -ne 0 ]; then
     echo >&2 '         Consider installing readlink on this platform.'
     _DOLLARZERO="$0"
 else
-    _DOLLARZERO=`readlink "$0" 2>/dev/null || echo "$0"`
+    # only certain platforms support the -e argument for readlink
+     if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then
+       _READLINK_ARG="-e"
+       _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"`
+    elif  [ -n "${_DARWIN}" ]; then
+       _DOLLARZERO=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)/`basename "${BASH_SOURCE[0]}"`
+    else
+       _DOLLARZERO=`readlink "$0" 2>/dev/null || echo "$0"`
+    fi
 fi
 
 RHQ_AGENT_BIN_DIR_PATH=`dirname "$_DOLLARZERO"`