diff --git a/bin/mac/inspect.sh b/bin/mac/inspect.sh
index b135e0376b24..5cdb35af6ebd 100644
--- a/bin/mac/inspect.sh
+++ b/bin/mac/inspect.sh
@@ -5,7 +5,7 @@
 # ------------------------------------------------------
 #
 
-export DEFAULT_PROJECT_PATH=`pwd`
+export DEFAULT_PROJECT_PATH="$(pwd)"
 
-IDE_BIN_HOME="$(dirname "$0")"
-exec "$IDE_BIN_HOME/../Contents/MacOS/@@script_name@@" inspect $*
+IDE_BIN_HOME="${0%/*}"
+exec "$IDE_BIN_HOME/../Contents/MacOS/@@script_name@@" inspect "$@"
diff --git a/bin/scripts/unix/idea.sh b/bin/scripts/unix/idea.sh
index 2edf65a030f5..dfa1a419a594 100755
--- a/bin/scripts/unix/idea.sh
+++ b/bin/scripts/unix/idea.sh
@@ -162,6 +162,6 @@ export LD_LIBRARY_PATH
 # Run the IDE.
 # ---------------------------------------------------------------------
 while true ; do
-  eval "$JDK/bin/java" $ALL_JVM_ARGS -Djb.restart.code=88 $MAIN_CLASS_NAME $*
+  eval "$JDK/bin/java" $ALL_JVM_ARGS -Djb.restart.code=88 $MAIN_CLASS_NAME "$@"
   test $? -ne 88 && break
 done
diff --git a/bin/scripts/unix/inspect.sh b/bin/scripts/unix/inspect.sh
index 4b4f140e9a69..26aadfa805ec 100644
--- a/bin/scripts/unix/inspect.sh
+++ b/bin/scripts/unix/inspect.sh
@@ -5,7 +5,7 @@
 # ------------------------------------------------------
 #
 
-export DEFAULT_PROJECT_PATH=`pwd`
+export DEFAULT_PROJECT_PATH="$(pwd)"
 
-IDE_BIN_HOME="$(dirname "$0")"
-exec "$IDE_BIN_HOME/@@script_name@@" inspect $*
+IDE_BIN_HOME="${0%/*}"
+exec "$IDE_BIN_HOME/@@script_name@@" inspect "$@"