Update bash and profile configurations

1 files changed, 30 insertions, 26 deletions

diff --git a/.profile b/.profile
index c2d0b76..12b78ae 100644
--- a/.profile
+++ b/.profile
@@ -1,11 +1,16 @@
-###########################################################
-# ~/.profile
-#
-###########################################################
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
 
 ###### locale ######
-export LANG="en_US.utf8"
-export LC_CTYPE="zh_CN.utf8"
+export LANG="en_US.UTF-8"
+export LC_CTYPE="zh_CN.UTF-8"
 export LC_COLLATE="C"
 
 ###### input method ######
@@ -16,9 +21,10 @@ export GTK3_IM_MODULE="fcitx"
 export QT_IM_MODULE="fcitx"
 export QT4_IM_MODULE="fcitx"
 
+
 ###### PATH ######
 # admin
-if `groups | grep -qE '\b(wheel|adm|sudo)\b'`; then
+if groups | grep -qE '\b(wheel|adm|sudo)\b'; then
     export PATH="$PATH:/usr/local/sbin:/usr/sbin:/sbin"
 fi
 # $HOME/bin
@@ -26,27 +32,25 @@ if [ -d "$HOME/bin" ]; then
     export PATH="$HOME/bin:$PATH"
 fi
 # npm
-if [ -d "$HOME/npm" ]; then
-    export PATH="$PATH:$HOME/npm"
-fi
-# TeXlive
-if [ -d "/usr/local/texlive/bin/x86_64-linux" ]; then
-    export PATH="$PATH:/usr/local/texlive/bin/x86_64-linux"
+if [ -d "$HOME/npm/bin" ]; then
+    export PATH="$PATH:$HOME/npm/bin"
 fi
 
-###### gpg agent ######
-gpgenv="$HOME/.gnupg/gpg-agent.env"
-if [ -e "${gpgenv}" ] && kill -0 $(grep GPG_AGENT_INFO "${gpgenv}" \
-        | cut -d: -f 2) 2>/dev/null; then
-    eval "$(cat "${gpgenv}")"
-else
-    eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "${gpgenv}")"
-fi
-export GPG_AGENT_INFO
-export SSH_AUTH_SOCK    # enable gpg-agent for ssh
 
-# This file is sourced by bash for login shells.  The following line
-# runs your .bashrc and is recommended by the bash info pages.
-[ -f ~/.bashrc ] && . ~/.bashrc
+###### Xmodmap ######
+[ -f ~/.Xmodmap ] && xmodmap ~/.Xmodmap
+
+
+###### ConTeXt ######
+export OSFONTDIR="/usr/local/share/fonts;$HOME/.fonts"
+
+
+###### bash ######
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+	. "$HOME/.bashrc"
+    fi
+fi
 
 # vim: set ts=8 sw=4 tw=0 fenc=utf-8 ft=sh: #