Skip to content

Fix which command lookups #35

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
Rendanic merged 2 commits into from
Nov 29, 2024
Merged

Fix which command lookups #35

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99c23d7
Fix which command lookups
JanSchnacki Nov 29, 2024
51d063a
Fix version date
JanSchnacki Nov 29, 2024
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
18 changes: 9 additions & 9 deletions ocenv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ fi
################################################################################

## Version of this script. Simply uses the date in YYYY-MM-DD format
GV_OCENV_VERSION="2024-08-23"
GV_OCENV_VERSION="2024-11-29"

###############################################################################
## Environment support homogenization
Expand Down Expand Up @@ -400,7 +400,7 @@ set_sql_path_vars() {
set_sql_path_vars

## Configure syntax highlighting in VIM, but only if not configured already
if [[ -n "$(which vim 2>/dev/null)" && -f "$(which vim)" ]]
if [[ -n "$(command which vim 2>/dev/null)" && -f "$(command which vim)" ]]
then
export EDITOR=vim
alias vi=vim
Expand Down Expand Up @@ -460,9 +460,9 @@ fi

if [[ -z "${GV_RLWRAP}" || ! -x "${GV_RLWRAP}" ]]
then
if [[ -x "$(which rlwrap 2>/dev/null)" ]]
if [[ -x "$(command which rlwrap 2>/dev/null)" ]]
then
GV_RLWRAP="$(which rlwrap 2>/dev/null)"
GV_RLWRAP="$(command which rlwrap 2>/dev/null)"
elif [[ "${GV_OS_TYPE}" == 'Linux' ]]
then
# Look for "custom" rlwrap binaries in $HOME of current user
Expand Down Expand Up @@ -568,7 +568,7 @@ then
echo "@${GV_CUSTOM_LOGIN_SQL}" >> "${GV_SQL_DIR}/login.sql"
fi

GV_LS_CMD="$(which ls)"
GV_LS_CMD="$(command which ls)"
alias cdh='cd ${ORACLE_HOME}'
unalias cdt 2>/dev/null
# shellcheck disable=2164
Expand All @@ -579,14 +579,14 @@ alias cda='if [[ -d "${ORACLE_BASE}/admin/${ORACLE_SID}" ]]; then cd "${ORACLE_B
alias cdd='cd ${GV_INSTANCE_DIAGNOSTIC_DEST}/trace'
alias pmon='ps -ef | grep -w -E "ora_pmon_[a-zA-Z0-9]+"'
## amon uses ASH if not called with "-l n" parameter
[[ -n "$(which amon 2>/dev/null)" ]] && alias amon="\$(which amon) -l n"
[[ -n "$(command which amon 2>/dev/null)" ]] && alias amon="\$(command which amon) -l n"
if [[ "${GV_OS_TYPE}" == "AIX" ]]
then
alias psg='ps -ef | grep -v grep | grep '
else
alias psg='ps aux | grep -v grep | grep --color=auto'
fi
if [[ -x "$(which less 2>/dev/null)" ]]
if [[ -x "$(command which less 2>/dev/null)" ]]
then
export GV_PAGER=less
else
Expand Down Expand Up @@ -1386,7 +1386,7 @@ edf() {
local LV_THRESHOLD_CRIT=95
local LV_THRESHOLD_WARN=85

if [[ "$(uname -s)" == "AIX" ]] && ! (which df 2>/dev/null| grep -q "/opt/freeware/")
if [[ "$(uname -s)" == "AIX" ]] && ! (command which df 2>/dev/null| grep -q "/opt/freeware/")
then
local LV_DF="df -Pg"
else
Expand Down Expand Up @@ -2338,7 +2338,7 @@ list_homes() {
}
mystat() {
local LV_TARGET="${1}"
if [[ "$(uname -s)" == "AIX" ]] && ! (which stat 2>/dev/null| grep -q "/opt/freeware/")
if [[ "$(uname -s)" == "AIX" ]] && ! (command which stat 2>/dev/null| grep -q "/opt/freeware/")
then
istat "${LV_TARGET}" | awk '/Owner/{split($2, v_a, "[()]"); print v_a[2]; }'
else
Expand Down