Skip to content

Commit 0d2a824

Browse files
authored
fix
1 parent 74579c3 commit 0d2a824

File tree

1 file changed

+23
-15
lines changed

1 file changed

+23
-15
lines changed

Linux/.bashrc

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,25 @@ export PS1="${nameC}\u${atC}@${hostC}\h${normalC}:${pathC}\w${pointerC}$ ${norma
6868

6969
#-------------------------------------------------------------------------------#
7070
##ENV VARS
71-
if [ -z "${USER}" ]; then
72-
USER="$(whoami)" && export USER="$USER"
71+
if [[ -z "${USER+x}" ]] || [[ -z "${USER##*[[:space:]]}" ]]; then
72+
USER="$(whoami | tr -d '[:space:]')"
7373
fi
74-
if [ -z "${HOME}" ]; then
75-
HOME="$(getent passwd $USER | cut -d: -f6)" && export HOME="$HOME"
74+
if [[ -z "${HOME+x}" ]] || [[ -z "${HOME##*[[:space:]]}" ]]; then
75+
HOME="$(getent passwd "${USER}" | awk -F':' 'NF >= 6 {print $6}' | tr -d '[:space:]')"
7676
fi
77-
if [ -z "${USER_AGENT}" ]; then
78-
USER_AGENT="$(curl -qfsSL 'https://pub.ajam.dev/repos/Azathothas/Wordlists/Misc/User-Agents/ua_chrome_macos_latest.txt')" && export USER_AGENT="${USER_AGENT}"
77+
if [[ -z "${HOMETMP+x}" ]] || [[ -z "${HOMETMP##*[[:space:]]}" ]]; then
78+
HOMETMP="${HOME}/tmp" ; mkdir -p "${HOMETMP}"
79+
fi
80+
if [[ -z "${USER_AGENT}" ]]; then
81+
USER_AGENT="$(curl -qfsSL 'https://raw.githubusercontent.com/pkgforge/devscripts/refs/heads/main/Misc/User-Agents/ua_chrome_macos_latest.txt')" && export USER_AGENT="${USER_AGENT}"
82+
fi
83+
if [[ -z "${SYSTMP+x}" ]] || [[ -z "${SYSTMP##*[[:space:]]}" ]]; then
84+
SYSTMP="$(dirname $(mktemp -u) | tr -d '[:space:]')"
7985
fi
80-
SYSTMP="$(dirname $(mktemp -u))" && export SYSTMP="${SYSTMP}"
8186
#Core
82-
export LANGUAGE=${LANGUAGE:-en_US:en}
83-
export LANG=${LANG:-en_US.UTF-8}
84-
export LC_ALL=${LC_ALL:-${LANG}}
87+
export LANGUAGE="${LANGUAGE:-en_US:en}"
88+
export LANG="${LANG:-en_US.UTF-8}"
89+
export LC_ALL="${LC_ALL:-${LANG}}"
8590
BW_INTERFACE="$(ip route | grep -i 'default' | awk '{print $5}' | tr -d '[:space:]')" && export BW_INTERFACE="${BW_INTERFACE}"
8691
current_dir="$(pwd)"
8792
##PATHS (Only Required)
@@ -93,7 +98,7 @@ export PATH="${HOME}/.local/share/soar/bin:${HOME}/bin:${HOME}/.cargo/bin:${HOME
9398

9499
#-------------------------------------------------------------------------------#
95100
##Aliases
96-
if [ -f ~/.bash_aliases ]; then
101+
if [[ -f ~/.bash_aliases ]]; then
97102
. ~/.bash_aliases
98103
fi
99104
alias 7z_archive='7z a -t7z -mx="9" -mmt="$(($(nproc)+1))" -bsp1 -bt $1 $2'
@@ -134,15 +139,15 @@ alias rdp_logs='grep -rsh "rdp" "/var/log" | sort | less'
134139
alias tail_log='tail -f -n +1'
135140
alias tmpdir='cd $(mktemp -d)'
136141
alias tmpdir_du='du -h --max-depth="1" "/tmp" 2>/dev/null | sort -hr'
137-
alias tmpdir_push='pushd "$(mktemp -d)" >/dev/null 2>&1'
138-
alias tmpdir_pop='popd >/dev/null 2>&1'
142+
alias tmpdir_push='pushd "$(mktemp -d)" &>/dev/null'
143+
alias tmpdir_pop='popd &>/dev/null'
139144
alias scb='xclip -selection c'
140145
alias vdir='vdir --color=auto'
141146
#-------------------------------------------------------------------------------#
142147

143148
#-------------------------------------------------------------------------------#
144149
##Completions
145-
if [ -f "/etc/bash_completion" ] && ! shopt -oq posix; then
150+
if [[ -f "/etc/bash_completion" ]] && ! shopt -oq posix; then
146151
. "/etc/bash_completion"
147152
fi
148153
#-------------------------------------------------------------------------------#
@@ -169,5 +174,8 @@ shopt -s checkwinsize
169174

170175
#-------------------------------------------------------------------------------#
171176
##Dedupe & Fix Path
172-
PATH="$(echo "${PATH}" | awk 'BEGIN{RS=":";ORS=":"}{gsub(/\n/,"");if(!a[$0]++)print}' | sed 's/:*$//')" ; export PATH
177+
if command -v awk &>/dev/null && command -v sed &>/dev/null; then
178+
PATH="$(echo "${PATH}" | awk 'BEGIN{RS=":";ORS=":"}{gsub(/\n/,"");if(!a[$0]++)print}' | sed 's/:*$//')"
179+
fi
180+
export PATH
173181
#-------------------------------------------------------------------------------#

0 commit comments

Comments
 (0)