summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2013-08-22 22:05:15 +0200
committerJan Pokorný <jpokorny@redhat.com>2013-08-22 22:05:15 +0200
commit4539177cebb1e210718cf03e0914025b19a26bbc (patch)
tree161f34c145f3b55493c99001d34fdd39c8c27593
parentc49882e7943d20327319bf7d3223927aad9cf126 (diff)
downloaddotfiles-4539177cebb1e210718cf03e0914025b19a26bbc.tar.gz
dotfiles-4539177cebb1e210718cf03e0914025b19a26bbc.tar.xz
dotfiles-4539177cebb1e210718cf03e0914025b19a26bbc.zip
Bash config: fix 2 diralias issues (dependency + unneeded error msg)
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rw-r--r--.bashrc17
1 files changed, 9 insertions, 8 deletions
diff --git a/.bashrc b/.bashrc
index b3bf876..4c86d04 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,5 +1,13 @@
# .bashrc
+# Some minimal API expected by sourced files
+_diralias () {
+ test "$(pwd)" = "$(eval echo "$(dirs +1 2>/dev/null)")" && popd -n &>/dev/null
+ test "$1" = "$(eval echo "$(dirs +0)")" || pushd "$1" >/dev/null
+ pwd
+}
+diralias () { alias "$(basename "$1")=_diralias $1"; }
+
# Source the other common definitions
for f in /etc/bashrc ~/.bashrc-fedora ~/.bashrc-priv; do
[ -f "${f}" ] && source "${f}" || :
@@ -24,14 +32,7 @@ alias acka='ack -a --follow'
# debug, etc.
alias hist-del-last='history -d $(history 1 | cut -d" " -f2)' # historical NOOP
-# dir aliases (use either as "gmy" or "rd $(gmy)")
-_diralias () {
- test "$(pwd)" = "$(eval echo "$(dirs +1)")" && popd -n &>/dev/null
- test "$1" = "$(eval echo "$(dirs +0)")" || pushd "$1" >/dev/null
- pwd
-}
-diralias () { alias "$(basename "$1")=_diralias $1"; }
-
+# dir aliases (use either as "gmy" or "cd $(gmy)")
diralias ~/wrkspc/gmy
diralias ~/wrkspc/gwork