|
 |
65c5d1 |
diff --git a/bashrc b/bashrc
|
|
|
65c5d1 |
index ddc4699..d19a7c1 100644
|
|
|
65c5d1 |
--- a/bashrc
|
|
|
65c5d1 |
+++ b/bashrc
|
|
|
65c5d1 |
@@ -71,7 +71,7 @@ if [ -z "$BASHRCSOURCED" ]; then
|
|
|
65c5d1 |
# Current threshold for system reserved uid/gids is 200
|
|
|
65c5d1 |
# You could check uidgid reservation validity in
|
|
|
65c5d1 |
# /usr/share/doc/setup-*/uidgid file
|
|
|
65c5d1 |
- if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then
|
|
|
65c5d1 |
+ if [ $UID -gt 199 ] && [ "`/usr/bin/id -gn`" = "`/usr/bin/id -un`" ]; then
|
|
|
65c5d1 |
umask 002
|
|
|
65c5d1 |
else
|
|
|
65c5d1 |
umask 022
|
|
|
65c5d1 |
diff --git a/csh.cshrc b/csh.cshrc
|
|
|
65c5d1 |
index d6fae9d..b83d5da 100644
|
|
|
65c5d1 |
--- a/csh.cshrc
|
|
|
65c5d1 |
+++ b/csh.cshrc
|
|
|
65c5d1 |
@@ -7,7 +7,7 @@
|
|
|
65c5d1 |
# Current threshold for system reserved uid/gids is 200
|
|
|
65c5d1 |
# You could check uidgid reservation validity in
|
|
|
65c5d1 |
# /usr/share/doc/setup-*/uidgid file
|
|
|
65c5d1 |
-if ($uid > 199 && "`id -gn`" == "`id -un`") then
|
|
|
65c5d1 |
+if ($uid > 199 && "`/usr/bin/id -gn`" == "`/usr/bin/id -un`") then
|
|
|
65c5d1 |
umask 002
|
|
|
65c5d1 |
else
|
|
|
65c5d1 |
umask 022
|
|
|
65c5d1 |
@@ -20,7 +20,7 @@ if ($?prompt) then
|
|
|
65c5d1 |
# make completion work better by default
|
|
|
65c5d1 |
set autolist
|
|
|
65c5d1 |
else
|
|
|
65c5d1 |
- set prompt=\[$user@`hostname -s`\]\$\
|
|
|
65c5d1 |
+ set prompt=\[$user@`/usr/bin/hostname -s`\]\$\
|
|
|
65c5d1 |
endif
|
|
|
65c5d1 |
endif
|
|
|
65c5d1 |
|
|
|
65c5d1 |
diff --git a/lang.csh b/lang.csh
|
|
|
65c5d1 |
index 695c1bc..94c4625 100644
|
|
|
65c5d1 |
--- a/lang.csh
|
|
|
65c5d1 |
+++ b/lang.csh
|
|
|
65c5d1 |
@@ -8,7 +8,7 @@ endif
|
|
|
65c5d1 |
foreach config (/etc/locale.conf "${HOME}/.i18n")
|
|
|
65c5d1 |
if (-f "${config}") then
|
|
|
65c5d1 |
# NOTE: We are using eval & sed here to avoid invoking of any commands & functions from those files.
|
|
|
65c5d1 |
- eval `sed -r -e 's/^[[:blank:]]*([[:upper:]_]+)=([[:print:][:digit:]\._-]+|"[[:print:][:digit:]\._-]+")/setenv \1 \2;/;t;d' ${config}`
|
|
|
65c5d1 |
+ eval `/usr/bin/sed -r -e 's/^[[:blank:]]*([[:upper:]_]+)=([[:print:][:digit:]\._-]+|"[[:print:][:digit:]\._-]+")/setenv \1 \2;/;t;d' ${config}`
|
|
|
65c5d1 |
endif
|
|
|
65c5d1 |
end
|
|
|
65c5d1 |
|
|
|
65c5d1 |
@@ -32,11 +32,11 @@ if (${?LC_ALL}) then
|
|
|
65c5d1 |
endif
|
|
|
65c5d1 |
|
|
|
65c5d1 |
# The ${LANG} manipulation is necessary only in virtual terminal (a.k.a. console - /dev/tty*):
|
|
|
65c5d1 |
-set in_console=`tty | grep -vc -e '/dev/tty'`
|
|
|
65c5d1 |
+set in_console=`/usr/bin/tty | /usr/bin/grep -vc -e '/dev/tty'`
|
|
|
65c5d1 |
|
|
|
65c5d1 |
if (${?LANG} && ${?TERM}) then
|
|
|
65c5d1 |
if (${TERM} == 'linux' && $in_console == 0) then
|
|
|
65c5d1 |
- set utf8_used=`echo ${LANG} | grep -vc -E -i -e '^.+\.utf-?8$'`
|
|
|
65c5d1 |
+ set utf8_used=`echo ${LANG} | /usr/bin/grep -vc -E -i -e '^.+\.utf-?8$'`
|
|
|
65c5d1 |
|
|
|
65c5d1 |
if (${utf8_used} == 0) then
|
|
|
65c5d1 |
switch (${LANG})
|
|
|
65c5d1 |
diff --git a/lang.sh b/lang.sh
|
|
|
65c5d1 |
index 0252b0f..c9022d0 100644
|
|
|
65c5d1 |
--- a/lang.sh
|
|
|
65c5d1 |
+++ b/lang.sh
|
|
|
65c5d1 |
@@ -8,7 +8,7 @@ fi
|
|
|
65c5d1 |
for config in /etc/locale.conf "${HOME}/.i18n"; do
|
|
|
65c5d1 |
# NOTE: We are using eval & sed here to avoid invoking of any commands & functions from those files.
|
|
|
65c5d1 |
if [ -f "${config}" ]; then
|
|
|
65c5d1 |
- eval $(sed -r -e 's/^[[:blank:]]*([[:upper:]_]+)=([[:print:][:digit:]\._-]+|"[[:print:][:digit:]\._-]+")/export \1=\2/;t;d' ${config})
|
|
|
65c5d1 |
+ eval $(/usr/bin/sed -r -e 's/^[[:blank:]]*([[:upper:]_]+)=([[:print:][:digit:]\._-]+|"[[:print:][:digit:]\._-]+")/export \1=\2/;t;d' ${config})
|
|
|
65c5d1 |
fi
|
|
|
65c5d1 |
done
|
|
|
65c5d1 |
|
|
|
65c5d1 |
@@ -32,8 +32,8 @@ if [ -n "${LC_ALL}" ]; then
|
|
|
65c5d1 |
fi
|
|
|
65c5d1 |
|
|
|
65c5d1 |
# The ${LANG} manipulation is necessary only in virtual terminal (a.k.a. console - /dev/tty*):
|
|
|
65c5d1 |
-if [ -n "${LANG}" ] && [ "${TERM}" = 'linux' ] && tty | grep --quiet -e '/dev/tty'; then
|
|
|
65c5d1 |
- if grep --quiet -E -i -e '^.+\.utf-?8$' <<< "${LANG}"; then
|
|
|
65c5d1 |
+if [ -n "${LANG}" ] && [ "${TERM}" = 'linux' ] && /usr/bin/tty | /usr/bin/grep --quiet -e '/dev/tty'; then
|
|
|
65c5d1 |
+ if /usr/bin/grep --quiet -E -i -e '^.+\.utf-?8$' <<< "${LANG}"; then
|
|
|
65c5d1 |
case ${LANG} in
|
|
|
65c5d1 |
ja*) LANG=en_US.UTF-8 ;;
|
|
|
65c5d1 |
ko*) LANG=en_US.UTF-8 ;;
|
|
|
65c5d1 |
diff --git a/profile b/profile
|
|
|
65c5d1 |
index 1feb987..16b2e69 100644
|
|
|
65c5d1 |
--- a/profile
|
|
|
65c5d1 |
+++ b/profile
|
|
|
65c5d1 |
@@ -25,10 +25,10 @@ pathmunge () {
|
|
|
65c5d1 |
if [ -x /usr/bin/id ]; then
|
|
|
65c5d1 |
if [ -z "$EUID" ]; then
|
|
|
65c5d1 |
# ksh workaround
|
|
|
65c5d1 |
- EUID=`id -u`
|
|
|
65c5d1 |
- UID=`id -ru`
|
|
|
65c5d1 |
+ EUID=`/usr/bin/id -u`
|
|
|
65c5d1 |
+ UID=`/usr/bin/id -ru`
|
|
|
65c5d1 |
fi
|
|
|
65c5d1 |
- USER="`id -un`"
|
|
|
65c5d1 |
+ USER="`/usr/bin/id -un`"
|
|
|
65c5d1 |
LOGNAME=$USER
|
|
|
65c5d1 |
MAIL="/var/spool/mail/$USER"
|
|
|
65c5d1 |
fi
|
|
|
65c5d1 |
@@ -56,7 +56,7 @@ export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE HISTCONTROL
|
|
|
65c5d1 |
# Current threshold for system reserved uid/gids is 200
|
|
|
65c5d1 |
# You could check uidgid reservation validity in
|
|
|
65c5d1 |
# /usr/share/doc/setup-*/uidgid file
|
|
|
65c5d1 |
-if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then
|
|
|
65c5d1 |
+if [ $UID -gt 199 ] && [ "`/usr/bin/id -gn`" = "`/usr/bin/id -un`" ]; then
|
|
|
65c5d1 |
umask 002
|
|
|
65c5d1 |
else
|
|
|
65c5d1 |
umask 022
|