|
|
@@ -3,8 +3,7 @@ PATH="$HOME/usr/local/bin:$HOME/bin:$HOME/usr/bin:$PATH"
|
|
|
export PATH
|
|
|
export LC_ALL=en_US.UTF-8
|
|
|
|
|
|
-if [ -z "$BASEPATH" ]
|
|
|
-then
|
|
|
+if [[ -z "$BASEPATH" ]]; then
|
|
|
export BASEPATH="$PATH"
|
|
|
fi
|
|
|
|
|
|
@@ -28,17 +27,12 @@ unlink-tools() {
|
|
|
export LD_LIBRARY_PATH
|
|
|
}
|
|
|
|
|
|
-if [[ $(uname) == "Darwin" ]]
|
|
|
-then # OSX / FreeBSD
|
|
|
- alias list="ls -lFhG"
|
|
|
-else
|
|
|
- alias list="ls -lFh --color"
|
|
|
-fi
|
|
|
alias listall="list -A"
|
|
|
alias git-graph="git log --graph --pretty=oneline --abbrev-commit --decorate --all"
|
|
|
alias disk-usage="ls -A | xargs du -shc | sort -h"
|
|
|
|
|
|
-alias reload="source ~/.profile-user"
|
|
|
+alias reload="source ~/.bashrc"
|
|
|
+alias crontab="VIM_CRONTAB=true crontab"
|
|
|
|
|
|
refreshterm() {
|
|
|
clear
|
|
|
@@ -65,7 +59,7 @@ alias mkcd="_mkcd_fun mkdir"
|
|
|
mkdirs() {
|
|
|
mkdir -p "$1"
|
|
|
}
|
|
|
-alias mkcds="_mkcd_fun mkdirs_fun"
|
|
|
+alias mkcds="_mkcd_fun mkdirs"
|
|
|
|
|
|
alias diffr="diff --ignore-blank-lines --minimal --side-by-side --report-identical-files --suppress-common-lines"
|
|
|
alias diffl="diff --changed-group-format='%<' --unchanged-group-format=''"
|
|
|
@@ -114,5 +108,11 @@ swap() {
|
|
|
|
|
|
alias coms="${HOME}/tools/comstore/commands.sh"
|
|
|
|
|
|
+if [[ $(uname) == "Darwin" ]]; then # OSX / FreeBSD
|
|
|
+ . ${HOME}/.profile-bsd
|
|
|
+else
|
|
|
+ . ${HOME}/.profile-linux
|
|
|
+fi
|
|
|
+
|
|
|
source ${HOME}/.profile-p4
|
|
|
|