diff options
| author | Marc-Andre Laperle | 2016-10-10 21:04:26 +0000 |
|---|---|---|
| committer | Marc-Andre Laperle | 2016-10-11 01:35:25 +0000 |
| commit | 3918b864ccfff8df87adc9f1dfa5c09d722d586b (patch) | |
| tree | cf0375a288a40acd556d98cd288818315cd410e7 /debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh | |
| parent | 1d7b40a6d2fe2af1ca2a448451d0b3d5dbd6bb66 (diff) | |
| download | org.eclipse.cdt-3918b864ccfff8df87adc9f1dfa5c09d722d586b.tar.gz org.eclipse.cdt-3918b864ccfff8df87adc9f1dfa5c09d722d586b.tar.xz org.eclipse.cdt-3918b864ccfff8df87adc9f1dfa5c09d722d586b.zip | |
Bug 497512 - cdtdebug.sh "bashisms" not supported by non-bash shells
Also include the latest version of plugins when launching
(tail vs head). This makes a difference when the plugins were
updated.
Change-Id: Id97c9247f0507e177592ca3631348bf8f7fd3dbf
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Diffstat (limited to 'debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh')
| -rw-r--r-- | debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh b/debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh index ba4146d880c..4875453390c 100644 --- a/debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh +++ b/debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh @@ -83,18 +83,17 @@ ECLIPSE_HOME=$(cd "$SCRIPT_DIR/../../.." && pwd) # install.sh will modify this ECLIPSE_EXEC="$ECLIPSE_HOME/eclipse" # On Mac OS X, the application layout is a bit different (Eclipse.app) -if [[ $ECLIPSE_HOME == *MacOS ]]; then - ECLIPSE_HOME="$ECLIPSE_HOME/../Eclipse" -fi +case $ECLIPSE_HOME in + *MacOS) ECLIPSE_HOME="$ECLIPSE_HOME/../Eclipse" ;; +esac PLUGIN_DIR="$ECLIPSE_HOME/plugins" - -OSGI_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.osgi_*.jar' -not -name '*source*' -exec basename {} \; | head -1` -SWT_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.swt.*.jar' -not -name '*source*' -exec basename {} \; | head -1` +OSGI_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.osgi_*.jar' -not -name '*source*' -exec basename {} \; | tail -1` +SWT_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.swt.*.jar' -not -name '*source*' -exec basename {} \; | tail -1` SWT_PLUGIN=`echo $SWT_JAR | sed -e "s/_[0-9]*\..*.jar//"` -FS_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.core.filesystem.*.jar' -not -name '*source*' -exec basename {} \; | grep -v java7 | head -1` +FS_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.core.filesystem.*.jar' -not -name '*source*' -exec basename {} \; | grep -v java7 | tail -1` FS_PLUGIN=`echo $FS_JAR | sed -e "s/_[0-9]*\..*.jar//"` -LINUX_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.cdt.core.linux.*.jar' -not -name '*source*' -exec basename {} \; | head -1` +LINUX_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.cdt.core.linux.*.jar' -not -name '*source*' -exec basename {} \; | tail -1` LINUX_PLUGIN=`echo $LINUX_JAR | sed -e "s/_[0-9]*\..*.jar//"` # Run eclipse with the Stand-alone Debugger product specified |