diff -up ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.fix ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh
--- ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.fix	2016-05-12 04:35:59.000000000 -0400
+++ ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh	2016-06-06 15:10:21.139600211 -0400
@@ -74,12 +74,15 @@ while test $# -gt 0 ; do
 done
 
 # Make sure local directory exists and has contents initialized
-if [ ! -d "$HOME/cdtdebugger" ]; then
-  /bin/sh "$SCRIPT_DIR/install.sh" || exit
+if [ $0 -nt "$HOME/fcdtdebugger" ]; then
+rm -rf $HOME/fcdtdebugger >/dev/null
+mkdir -p $HOME/fcdtdebugger
+cp config.ini $HOME/fcdtdebugger
+cp dev.properties $HOME/fcdtdebugger
 fi
 
 # Calculate platform-specific jar file names
-ECLIPSE_HOME=$(cd "$SCRIPT_DIR/../../.." && pwd)  # install.sh will modify this line.  DO NOT REMOVE THE FOLLOWING MARKER: @#@#
+ECLIPSE_HOME=$(dirname $(readlink -f $(which eclipse)))
 ECLIPSE_EXEC="$ECLIPSE_HOME/eclipse"
 
 # On Mac OS X, the application layout is a bit different (Eclipse.app)
@@ -88,19 +91,24 @@ if [[ $ECLIPSE_HOME == *MacOS ]]; then
 fi
 
 PLUGIN_DIR="$ECLIPSE_HOME/plugins"
+CDT_PLUGIN_DIR="@CDT_DROPINS@"
 
 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`
+LAUNCHBAR_CORE_JAR=`find /usr/share/eclipse/droplets -maxdepth 5 -name 'org.eclipse.launchbar.core_*.jar' -not -name '*source*'`
+UI_VIEWS_LOG_JAR=`find /usr/share/eclipse/droplets -maxdepth 5 -name 'org.eclipse.ui.views.log_*.jar' -not -name '*source*'`
+SWT_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.swt.*' -not -name '*source*' -exec basename {} \; | head -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_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 "$CDT_PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.cdt.core.linux.*.jar' -not -name '*source*' -exec basename {} \; | head -1`
 LINUX_PLUGIN=`echo $LINUX_JAR | sed -e "s/_[0-9]*\..*.jar//"`
 
 # Run eclipse with the Stand-alone Debugger product specified
 "$ECLIPSE_EXEC" -clean -product org.eclipse.cdt.debug.application.product \
-                        -data "$HOME/workspace-cdtdebug" -configuration file\:"$HOME/cdtdebugger" \
-                        -dev file\:"$HOME/cdtdebugger/dev.properties" $options \
+                        -application org.eclipse.cdt.debug.application.app \
+                        -data "$HOME/workspace-fcdtdebug" -configuration file\:"$HOME/fcdtdebugger" \
+                        -dev file\:"$HOME/fcdtdebugger/dev.properties" $options \
                         -vmargs -Dosgi.jar=$OSGI_JAR -Dswt.plugin=$SWT_PLUGIN -Dfs.plugin=$FS_PLUGIN \
+                        -Dlaunchbar.core=$LAUNCHBAR_CORE_JAR -Dui.views.log=$UI_VIEWS_LOG_JAR \
                         -Dlinux.plugin=$LINUX_PLUGIN -Declipse.home="$ECLIPSE_HOME"
 
diff -up ./debug/org.eclipse.cdt.debug.application/scripts/install.sh.fix ./debug/org.eclipse.cdt.debug.application/scripts/install.sh
--- ./debug/org.eclipse.cdt.debug.application/scripts/install.sh.fix	2016-05-12 04:35:59.000000000 -0400
+++ ./debug/org.eclipse.cdt.debug.application/scripts/install.sh	2016-06-06 15:06:51.654974746 -0400
@@ -15,40 +15,4 @@
 
 SCRIPT_DIR=`dirname $0`
 
-IS_MAC=0
-
-if [ ! -f "$SCRIPT_DIR/../../../eclipse" ]; then
-  if [ ! -f "$SCRIPT_DIR/../../../../MacOS/eclipse" ]; then
-    echo "$0: error: eclipse executable not found in expected location"
-    echo " "
-    echo "This can occur if you are running this script from your local .eclipse directory"
-    echo "which would mean you are running a shared instance of the Eclipse platform for"
-    echo "your distro and have installed the Stand-alone Debugger from an eclipse.org"
-    echo "download repo.  Downloading the Stand-alone Debugger feature on top of a distro"
-    echo "version of Eclipse Debugger is not supported.  If you are using a distro version"
-    echo "of the Eclipse platform, you should not use this script.  Instead, install the"
-    echo "corresponding Eclipse CDT package for your distro (e.g. eclipse-cdt package)"
-    echo "which will install the Stand-alone Debugger for you."
-    exit 1
-  else
-    IS_MAC=1
-  fi
-fi
-
-if [ ! -d "$HOME/cdtdebugger" ]; then
-  mkdir -p "$HOME/cdtdebugger"
-fi
-cp "$SCRIPT_DIR/config.ini" "$HOME/cdtdebugger"
-cp "$SCRIPT_DIR/dev.properties" "$HOME/cdtdebugger"
-cp "$SCRIPT_DIR/cdtdebug.sh" "$HOME/cdtdebugger"
-chmod +x "$HOME/cdtdebugger/cdtdebug.sh"
-
-if [ $IS_MAC -eq 0 ]; then
-  ECLIPSE_HOME=$(cd "$SCRIPT_DIR/../../.." && pwd)
-else
-  ECLIPSE_HOME=$(cd "$SCRIPT_DIR/../../../../MacOS" && pwd)
-fi
-
-# Replace the entire line with tag @#@# by the actual location of the eclipse installation
-sed -i -e "s,^.*@#@#.*$,ECLIPSE_HOME=$ECLIPSE_HOME," "$HOME/cdtdebugger/cdtdebug.sh"
-echo "Installation complete"
+echo "Installation already done"