From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Sat, 7 Feb 2015 13:16:45 +0000 (+0000)
Subject: bashrc*
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=3ea2cc5af360656ab0c45292043fee22d949ca13;p=nb.git

bashrc*
---

diff --git a/etc/bashrc b/etc/bashrc
index 2ab34643..45a7ec95 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -1,16 +1,19 @@
-. "${BASH_SOURCE%/*}/bashrc.function"
-. "${BASH_SOURCE%/*}/bashrc.alias"
 #################################################################################
 #
 # ENVS
 #
 #################################################################################
-NB_ROOT=$(realpath ${BASH_SOURCE%/*}/..)
 [ -z "$HOSTNAME" ] && HOSTNAME=`hostname`
 [ -z "$UID" ] && UID=`id -u`
 [ -z "$USER" ] && USER=`whoami`
+
+. "${BASH_SOURCE%/*}/bashrc.function"
+
+NB_ROOT=$(realpath ${BASH_SOURCE%/*}/..)
 [ -z "$HOME" ] && HOME=`realpath ~/`
 
+. "${BASH_SOURCE%/*}/bashrc.alias"
+
 #
 # PATH
 #
diff --git a/etc/bashrc.alias b/etc/bashrc.alias
index e0675848..93b45476 100644
--- a/etc/bashrc.alias
+++ b/etc/bashrc.alias
@@ -14,6 +14,7 @@ alias password-gener='apg -m 12 -x 12 -a 0 -M L|head -1;'
 alias mysqlshow-view="mysql -e \"SHOW FULL TABLES WHERE TABLE_TYPE LIKE 'VIEW'\""
 alias nmap-ping="nmap -sP -PE -PS443 -PA21,22,23,80,3389"
 alias arp-list="arp -an"
+[ "$USER" != "postgres" ] && alias psql='sudo -u postgres psql'
 
 #--------------------------------------------------------------------------------
 # Etherwake
diff --git a/etc/bashrc.function b/etc/bashrc.function
index f0fe6c52..20643597 100644
--- a/etc/bashrc.function
+++ b/etc/bashrc.function
@@ -83,7 +83,7 @@ env-add-path() {
 }
 
 function realpath() {
-  perl -MFile::Spec -MCwd -e 'print File::Spec->rel2abs( Cwd::abs_path($ARGV[0]) )' $1
+  perl -MFile::Spec -MCwd -e 'print File::Spec->rel2abs( Cwd::abs_path($ARGV[0]) )."\n"' $1
 }
 
 function ascii() {