Skip to content

Commit

Permalink
fix(main/zsh): Fix zsh-newuser-install being run twice (#20787)
Browse files Browse the repository at this point in the history
Zsh already automatically runs zsh-newuser-install as part of the
`newuser` module. Running it manually in the system zshrc caused it to
run twice.

Not previously caught due to `zsh-newuser-install` exiting if the terminal size is below 72x15
  • Loading branch information
termux-pacman-bot committed Jul 6, 2024
1 parent d8a42f6 commit c5c9f24
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion packages/zsh/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="custom"
TERMUX_PKG_LICENSE_FILE="LICENCE"
TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000"
TERMUX_PKG_VERSION=5.9
TERMUX_PKG_REVISION=4
TERMUX_PKG_REVISION=5
TERMUX_PKG_SRCURL="https://sourceforge.net/projects/zsh/files/zsh/$TERMUX_PKG_VERSION/zsh-$TERMUX_PKG_VERSION".tar.xz
TERMUX_PKG_SHA256=9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5
# Remove hard link to bin/zsh as Android does not support hard links:
Expand Down
6 changes: 0 additions & 6 deletions packages/zsh/etc-zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,4 @@ command_not_found_handler() {
@TERMUX_PREFIX@/libexec/termux/command-not-found $1
}
PS1='%# '
# If there is no .zshrc offer to set one up
# This is the same fresh install behavior as for example on Arch Linux
[[ -r "${ZDOTDIR:-$HOME}"/.zshrc ]] || {
autoload -U zsh-newuser-install
zsh-newuser-install
}
# vim: set noet ft=zsh tw=4 sw=4 ff=unix

0 comments on commit c5c9f24

Please sign in to comment.