Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2014-06-04 16:08:10 +0000
committerJeff Johnston2014-06-09 15:32:37 +0000
commit9e72bd9258d37bbd71a0474634f449807922481f (patch)
tree973d12d19e0e5f33ab3eed00603336aafae0e745
parent93e4ab50ec5cef547b6ff2eaa29bcd918f4fad93 (diff)
downloadorg.eclipse.cdt-9e72bd9258d37bbd71a0474634f449807922481f.tar.gz
org.eclipse.cdt-9e72bd9258d37bbd71a0474634f449807922481f.tar.xz
org.eclipse.cdt-9e72bd9258d37bbd71a0474634f449807922481f.zip
Bug 436554 - standalone debugger cannot find pushd/popd on Ubuntu
- Fix cdtdebug.sh to not use pushd/popd - Fix install.sh script to do proper sed now that pushd is not used Change-Id: I466af0b0b6e09a53eb11505ce480138b5b538378 Reviewed-on: https://git.eclipse.org/r/27966 Tested-by: Hudson CI Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> Tested-by: Jeff Johnston <jjohnstn@redhat.com>
-rwxr-xr-xdebug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh5
-rwxr-xr-xdebug/org.eclipse.cdt.debug.application/scripts/install.sh9
2 files changed, 8 insertions, 6 deletions
diff --git a/debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh b/debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh
index a20f1a2cd9a..45385049ec8 100755
--- a/debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh
+++ b/debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh
@@ -14,7 +14,8 @@ mkdir -p $HOME/cdtdebugger
cp config.ini $HOME/cdtdebugger
cp dev.properties $HOME/cdtdebugger
fi
-pushd ../.. >/dev/null
+olddir=`pwd`
+cd ../..
OSGI_JAR=`ls org.eclipse.osgi_*.jar`
SWT_JAR=`ls org.eclipse.swt.*.jar`
SWT_PLUGIN=`echo $SWT_JAR | sed -e "s/_[0-9]*\..*.jar//"`
@@ -23,7 +24,7 @@ FS_PLUGIN=`echo $FS_JAR | sed -e "s/_[0-9]*\..*.jar//"`
LINUX_JAR=`ls org.eclipse.cdt.core.linux.*.jar`
LINUX_PLUGIN=`echo $LINUX_JAR | sed -e "s/_[0-9]*\..*.jar//"`
cd ..; ECLIPSE_HOME=`pwd`
-popd >/dev/null
+cd $olddir
$ECLIPSE_HOME/eclipse -clean -product org.eclipse.cdt.debug.application.product \
-data $HOME/workspace-gdbstandlone -configuration file\:$HOME/cdtdebugger \
-dev file\:$HOME/cdtdebugger/dev.properties $@ \
diff --git a/debug/org.eclipse.cdt.debug.application/scripts/install.sh b/debug/org.eclipse.cdt.debug.application/scripts/install.sh
index d67df88789c..adb56c1059d 100755
--- a/debug/org.eclipse.cdt.debug.application/scripts/install.sh
+++ b/debug/org.eclipse.cdt.debug.application/scripts/install.sh
@@ -16,8 +16,9 @@ cp config.ini $HOME/cdtdebugger
cp dev.properties $HOME/cdtdebugger
cp cdtdebug.sh $HOME/cdtdebugger
chmod +x $HOME/cdtdebugger/cdtdebug.sh
-pushd ../.. >/dev/null
+olddir=`pwd`
+cd ../..
PLUGINS_DIR=`pwd`
-popd >/dev/null
-sed -i -e "s,pushd ../..,pushd $PLUGINS_DIR," $HOME/cdtdebugger/cdtdebug.sh
-echo "Installation complete" \ No newline at end of file
+cd $olddir
+sed -i -e "s,cd ../..,cd $PLUGINS_DIR," $HOME/cdtdebugger/cdtdebug.sh
+echo "Installation complete"

Back to the top