Merge 84e0787411 into 9626ce2beb

Add exception for VSCode env helper
Signed-off-by: msdx321 <msdx321@gmail.com>
2025-01-23 11:32:17 +08:00 · 2024-12-12 08:11:14 +05:30 · 2024-12-12 07:47:13 +05:30 · 2023-05-04 13:58:37 -05:00
8 changed files with 8 additions and 11 deletions
--- a/modules/archive/functions/archive
+++ b/modules/archive/functions/archive
@ -10,7 +10,7 @@
 local archive_name path_to_archive _gzip_bin _bzip2_bin _xz_bin _zstd_bin

 if (( $# < 2 )); then
-  cat >&2 <<EOF
+  >&2 <<EOF
 usage: $0 [archive_name.zip] [/path/to/include/into/archive ...]

 Where 'archive.zip' uses any of the following extensions:
--- a/modules/archive/functions/lsarchive
+++ b/modules/archive/functions/lsarchive
@ -10,7 +10,7 @@
 local verbose

 if (( $# == 0 )); then
-  cat >&2 <<EOF
+  >&2 <<EOF
 usage: $0 [-option] [file ...]

 options:
--- a/modules/archive/functions/unarchive
+++ b/modules/archive/functions/unarchive
@ -15,7 +15,7 @@ local extract_dir
 local _gzip_bin _bzip2_bin _xz_bin _zstd_bin

 if (( $# == 0 )); then
-  cat >&2 <<EOF
+  >&2 <<EOF
 usage: $0 [-option] [file ...]

 options:
--- a/modules/dpkg/functions/deb-history
+++ b/modules/dpkg/functions/deb-history
@ -26,7 +26,7 @@ case "$1" in
    zcat $(ls -rt /var/log/dpkg*)
  ;;
  (*)
-    cat >&2 <<EOF
+    >&2 <<EOF
 Commands:
    install - List installed packages
    upgrade - List upgraded packages
--- a/modules/tmux/init.zsh
+++ b/modules/tmux/init.zsh
@ -23,7 +23,7 @@ if ([[ "$TERM_PROGRAM" = 'iTerm.app' ]] && \
  _tmux_iterm_integration='-CC'
 fi

-if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && "$TERM_PROGRAM" != "vscode" && "$TERMINAL_EMULATOR" != "JetBrains-JediTerm" ]] && ( \
+if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && -z "$VSCODE_RESOLVING_ENVIRONMENT" && "$TERM_PROGRAM" != "vscode" && "$TERMINAL_EMULATOR" != "JetBrains-JediTerm" ]] && ( \
  ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
  ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
 ); then
--- a/modules/utility/functions/prep
+++ b/modules/utility/functions/prep
@ -9,8 +9,7 @@

 local usage pattern modifiers invert

-usage="$(
-cat <<EOF
+usage="$(<<EOF
 usage: $0 [-option ...] [--] pattern [file ...]

 options:
--- a/modules/utility/functions/psub
+++ b/modules/utility/functions/psub
@ -9,8 +9,7 @@

 local usage pattern replacement modifiers

-usage="$(
-cat <<EOF
+usage="$(<<EOF
 usage: $0 [-option ...] [--] pattern replacement [file ...]

 options:
--- a/modules/utility/functions/zsh-help
+++ b/modules/utility/functions/zsh-help
@ -9,8 +9,7 @@

 # function zsh-help {

-local usage="$(
-cat <<EOF
+local usage="$(<<EOF
 usage: $0 [--help] [--zsh-help-debug] [--all] search term(s)
 Options:
    --all - search for the term anywhere, not just at the start of a line.
Author	SHA1	Message	Date
Indrajit Raychaudhuri	f4dd80673b	Merge `84e0787411` into `9626ce2beb`	2024-12-12 08:11:14 +05:30
msdx321	9626ce2beb	Add exception for VSCode env helper Signed-off-by: msdx321 <msdx321@gmail.com>	2024-12-12 07:47:13 +05:30
Indrajit Raychaudhuri	84e0787411	general: Remove redundant usage of `cat` In general, the substitution ‘$(cat foo)’ may be replaced by the equivalent but faster ‘$(<foo)’. See: https://zsh.sourceforge.io/Doc/Release/Expansion.html#Command-Substitution	2023-05-04 13:58:37 -05:00