Skip to content

Revert "Improve internal directory-changing (#247)" #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hyperupcall merged 1 commit into from
Apr 12, 2025
Merged

Revert "Improve internal directory-changing (#247)" #255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 5 additions & 25 deletions activate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,6 @@ AUTOENV_ENV_LEAVE_FILENAME="${AUTOENV_ENV_LEAVE_FILENAME:-.env.leave}"
: ${AUTOENV_VIEWER:=}
# AUTOENV_ENABLE_LEAVE

# @internal
__autoenv_cd() {
if [ "${__autoenv_has_builtin}" = 'yes' ]; then
\builtin cd "${1}" || return
else
# Some shells like "dash" do not have "builtin".
\chdir "${1}" || return
fi
}

# @internal
__autoenv_use_color() {
if [ ${NO_COLOR+x} ]; then
return 1
Expand Down Expand Up @@ -109,7 +98,7 @@ autoenv_init() {
# Discover all files that we need to source.
local _files
_files=$(
__autoenv_cd "${_pwd}"
\command -v chdir >/dev/null 2>&1 && \chdir "${_pwd}" || \builtin cd "${_pwd}"
_hadone=''
while :; do
_file="$(\pwd -P)/${AUTOENV_ENV_FILENAME}"
Expand All @@ -124,7 +113,7 @@ ${_file}"
fi
[ "$(\pwd -P)" = "${_mountpoint}" ] && \break
[ "$(\pwd -P)" = "/" ] && \break
__autoenv_cd "$(\pwd -P)/.."
\command -v chdir >/dev/null 2>&1 && \chdir "$(\pwd -P)/.." || \builtin cd "$(\pwd -P)/.."
done
)

Expand Down Expand Up @@ -274,7 +263,7 @@ autoenv_source() {
# @description Function to override the 'cd' builtin
autoenv_cd() {
local _pwd="${PWD}"
if __autoenv_cd "${@}"; then
if \command -v chdir >/dev/null 2>&1 && \chdir "${@}" || \builtin cd "${@}"; then
autoenv_init "${_pwd}"
\return 0
else
Expand All @@ -290,7 +279,7 @@ autoenv_leave() {
# Discover all files that we need to source.
local _files
_files=$(
__autoenv_cd "${from_dir}"
\command -v chdir >/dev/null 2>&1 && \chdir "${from_dir}" || \builtin cd "${from_dir}"
_hadone=''
while [ "$PWD" != "" ] && [ "$PWD" != "/" ]; do
case $to_dir/ in
Expand All @@ -308,7 +297,7 @@ autoenv_leave() {
${_file}"
fi
fi
__autoenv_cd "$PWD/.."
\command -v chdir >/dev/null 2>&1 && \chdir "$(\pwd)/.." || \builtin cd "$PWD/.."
;;
esac
done
Expand Down Expand Up @@ -353,7 +342,6 @@ enable_autoenv() {
}
fi

# shellcheck disable=SC2164
cd "${PWD}"
}

Expand All @@ -362,14 +350,6 @@ if [ "${__autoenv_unset_aliasfuncdef:-}" = 'yes' ]; then
\unset -v __autoenv_unset_aliasfuncdef
fi

__autoenv_has_builtin=no
if __autoenv_output=$(\type builtin); then
if [ "${__autoenv_output}" = 'builtin is a shell builtin' ]; then
__autoenv_has_builtin=yes
fi
fi
\unset -v __autoenv_output

# If some shasum exists, specifically use it. Otherwise, do not enable autoenv.
if \command -v gsha1sum >/dev/null 2>&1; then
autoenv_shasum() {
Expand Down
Loading