@@ -1,5 +1,20 @@

 if [[ $TERM_PROGRAM == "iTerm.app" && -o interactive ]]; then

-  if [ "$ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX""$TERM" != "screen" -a "$ITERM_SHELL_INTEGRATION_INSTALLED" = "" ]; then

+# This program is free software; you can redistribute it and/or

+# modify it under the terms of the GNU General Public License

+# as published by the Free Software Foundation; either version 2

+# of the License, or (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

+

+if [[ -o interactive ]]; then

+  if [ "${ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX-}""$TERM" != "screen" -a "${ITERM_SHELL_INTEGRATION_INSTALLED-}" = "" -a "$TERM" != linux -a "$TERM" != dumb ]; then

     ITERM_SHELL_INTEGRATION_INSTALLED=Yes

     ITERM2_SHOULD_DECORATE_PROMPT="1"

     # Indicates start of command output. Runs just before command executes.

@@ -19,11 +34,12 @@ if [[ $TERM_PROGRAM == "iTerm.app" && -o interactive ]]; then

     whence -v iterm2_print_user_vars > /dev/null 2>&1

     if [ $? -ne 0 ]; then

       iterm2_print_user_vars() {

+          true

       }

     fi

     iterm2_print_state_data() {

-      printf "\033]1337;RemoteHost=%s@%s\007" "$USER" "$iterm2_hostname"

+      printf "\033]1337;RemoteHost=%s@%s\007" "$USER" "${iterm2_hostname-}"

       printf "\033]1337;CurrentDir=%s\007" "$PWD"

       iterm2_print_user_vars

     }

@@ -89,17 +105,22 @@ if [[ $TERM_PROGRAM == "iTerm.app" && -o interactive ]]; then

       ITERM2_SHOULD_DECORATE_PROMPT=""

       # Add our escape sequences just before the prompt is shown.

-      if [[ $PS1 == *'$(iterm2_prompt_mark)'* ]]

-      then

-        PS1="$PS1%{$(iterm2_prompt_end)%}"

+      # Use ITERM2_SQUELCH_MARK for people who can't mdoify PS1 directly, like powerlevel9k users.

+      # This is gross but I had a heck of a time writing a correct if statetment for zsh 5.0.2.

+      local PREFIX=""

+      if [[ $PS1 == *"$(iterm2_prompt_mark)"* ]]; then

+        PREFIX=""

+      elif [[ "${ITERM2_SQUELCH_MARK-}" != "" ]]; then

+        PREFIX=""

       else

-        PS1="%{$(iterm2_prompt_mark)%}$PS1%{$(iterm2_prompt_end)%}"

+        PREFIX="%{$(iterm2_prompt_mark)%}"

       fi

+      PS1="$PREFIX$PS1%{$(iterm2_prompt_end)%}"

     }

     iterm2_precmd() {

       local STATUS="$?"

-      if [ -z "$ITERM2_SHOULD_DECORATE_PROMPT" ]; then

+      if [ -z "${ITERM2_SHOULD_DECORATE_PROMPT-}" ]; then

         # You pressed ^C while entering a command (iterm2_preexec did not run)

         iterm2_before_cmd_executes

       fi

@@ -119,23 +140,25 @@ if [[ $TERM_PROGRAM == "iTerm.app" && -o interactive ]]; then

       iterm2_before_cmd_executes

     }

-    # If hostname -f is slow on your system, set iterm2_hostname prior to sourcing this script.

-    [[ -z "$iterm2_hostname" ]] && iterm2_hostname=`hostname -f 2>/dev/null`

-    # some flavors of BSD (i.e. NetBSD and OpenBSD) don't have the -f option

-    if [ $? -ne 0 ]; then

-      iterm2_hostname=`hostname`

+    # If hostname -f is slow on your system set iterm2_hostname prior to

+    # sourcing this script.

+    if [ -z "${iterm2_hostname-}" ]; then

+      iterm2_hostname=`hostname -f 2>/dev/null`

+      # Some flavors of BSD (i.e. NetBSD and OpenBSD) don't have the -f option.

+      if [ $? -ne 0 ]; then

+	iterm2_hostname=`hostname`

+      fi

     fi

-    if [[ "$TERM_PROGRAM" = "iTerm.app" ]]; then 

-      [[ -z $precmd_functions ]] && precmd_functions=()

-      precmd_functions=($precmd_functions iterm2_precmd)

+    [[ -z ${precmd_functions-} ]] && precmd_functions=()

+    precmd_functions=($precmd_functions iterm2_precmd)

-      [[ -z $preexec_functions ]] && preexec_functions=()

-      preexec_functions=($preexec_functions iterm2_preexec)

+    [[ -z ${preexec_functions-} ]] && preexec_functions=()

+    preexec_functions=($preexec_functions iterm2_preexec)

-      iterm2_print_state_data

-      printf "\033]1337;ShellIntegrationVersion=6;shell=zsh\007"

-    fi

+    iterm2_print_state_data

+    printf "\033]1337;ShellIntegrationVersion=11;shell=zsh\007"

   fi

-  alias imgcat=~/.iterm2/imgcat;alias imgls=~/.iterm2/imgls;alias it2attention=~/.iterm2/it2attention;alias it2check=~/.iterm2/it2check;alias it2copy=~/.iterm2/it2copy;alias it2dl=~/.iterm2/it2dl;alias it2getvar=~/.iterm2/it2getvar;alias it2setcolor=~/.iterm2/it2setcolor;alias it2setkeylabel=~/.iterm2/it2setkeylabel;alias it2ul=~/.iterm2/it2ul;alias it2universion=~/.iterm2/it2universion

+fi

+alias imgcat=${HOME}/.iterm2/imgcat;alias imgls=${HOME}/.iterm2/imgls;alias it2api=${HOME}/.iterm2/it2api;alias it2attention=${HOME}/.iterm2/it2attention;alias it2check=${HOME}/.iterm2/it2check;alias it2copy=${HOME}/.iterm2/it2copy;alias it2dl=${HOME}/.iterm2/it2dl;alias it2getvar=${HOME}/.iterm2/it2getvar;alias it2git=${HOME}/.iterm2/it2git;alias it2setcolor=${HOME}/.iterm2/it2setcolor;alias it2setkeylabel=${HOME}/.iterm2/it2setkeylabel;alias it2ul=${HOME}/.iterm2/it2ul;alias it2universion=${HOME}/.iterm2/it2universion

 fi