diff options
author | patrick brisbin <pbrisbin@gmail.com> | 2013-12-09 15:47:42 -0500 |
---|---|---|
committer | patrick brisbin <pbrisbin@gmail.com> | 2013-12-11 09:40:38 -0500 |
commit | 4b163f5565269faadc64995a3a903fa28c65f7b3 (patch) | |
tree | 3c14dcde5d88486c66f3c5491fbd512c55143e79 | |
parent | 3cc63e020bcd6c9a684957d10cd754bc0a1e1dc6 (diff) |
Prefer RCRC environment variable over ~/.rcrc
* Centralize configuration loading in rcm.sh(.in)
* Check for readability, not just existence
Add RCRC notes to all manpages. Putting the environment variables in a
table lines them up more neatly and definitively, across all output
formats, and also follows the examples used by e.g. BSD ls(1).
-rwxr-xr-x | bin/lsrc | 4 | ||||
-rwxr-xr-x | bin/mkrc | 4 | ||||
-rwxr-xr-x | bin/rcdn | 4 | ||||
-rwxr-xr-x | bin/rcup | 4 | ||||
-rw-r--r-- | man/lsrc.1 | 6 | ||||
-rw-r--r-- | man/mkrc.1 | 6 | ||||
-rw-r--r-- | man/rcdn.1 | 6 | ||||
-rw-r--r-- | man/rcrc.5 | 5 | ||||
-rw-r--r-- | man/rcup.1 | 6 | ||||
-rw-r--r-- | share/rcm.sh.in | 6 |
10 files changed, 33 insertions, 18 deletions
@@ -242,10 +242,6 @@ handle_command_line() { DEST_STACK= -if [ -e $HOME/.rcrc ]; then - . $HOME/.rcrc -fi - handle_command_line $* : ${DOTFILES_DIRS:=$DOTFILES_DIRS $DEFAULT_DOTFILES_DIR} @@ -18,10 +18,6 @@ destination() { fi } -if [ -e $HOME/.rcrc ]; then - . $HOME/.rcrc -fi - show_help() { local exit_code=${1:-0} @@ -79,10 +79,6 @@ handle_command_line() { LS_ARGS=-F -if [ -e $HOME/.rcrc ]; then - . $HOME/.rcrc -fi - handle_command_line $* : ${DOTFILES_DIRS:=$DOTFILES_DIRS $DEFAULT_DOTFILES_DIR} @@ -155,10 +155,6 @@ handle_command_line() { LS_ARGS=-F -if [ -e $HOME/.rcrc ]; then - . $HOME/.rcrc -fi - handle_command_line $* : ${DOTFILES_DIRS:=$DOTFILES_DIRS $DEFAULT_DOTFILES_DIR} @@ -93,6 +93,12 @@ Or more simply: .Pp .Dl bash_profile .Pp +.Sh ENVIRONMENT +.Bl -tag -width ".Ev RCRC" +.It Ev RCRC +User configuration file. Defaults to +.Pa ~/.rcrc . +.El .Sh FILES .Pa ~/.dotfiles .Pa ~/.rcrc @@ -33,6 +33,12 @@ install dotfiles according to tag .It Fl v increase verbosity. This can be repeated for extra verbosity. .El +.Sh ENVIRONMENT +.Bl -tag -width ".Ev RCRC" +.It Ev RCRC +User configuration file. Defaults to +.Pa ~/.rcrc . +.El .Sh FILES .Pa ~/.dotfiles .Pa ~/.rcrc @@ -86,6 +86,12 @@ only remove the specified file(s) .Dl rcdn -t python .Dl rcdn -d ~/corporate-dotfiles .Dl rcdn -e '*:.zshrc' +.Sh ENVIRONMENT +.Bl -tag -width ".Ev RCRC" +.It Ev RCRC +User configuration file. Defaults to +.Pa ~/.rcrc . +.El .Sh FILES .Pa ~/.rcrc .Sh SEE ALSO @@ -17,8 +17,9 @@ .Sh DESCRIPTION The rcm dotfile manager can be configured using a .Pa .rcrc -file in your home directory. The format is POSIX shell. It is -sourced in by the +file in your home directory. This location can be changed by setting the +.Pa RCRC +environment variable. The format is POSIX shell. It is sourced in by the .Xr lsrc 1 , .Xr mkrc 1 , .Xr rcdn 1 , @@ -170,6 +170,12 @@ or from The post-up hook is run. .El . +.Sh ENVIRONMENT +.Bl -tag -width ".Ev RCRC" +.It Ev RCRC +User configuration file. Defaults to +.Pa ~/.rcrc . +.El .Sh FILES .Pa ~/.dotfiles .Pa ~/.rcrc diff --git a/share/rcm.sh.in b/share/rcm.sh.in index e01ec59..2af2418 100644 --- a/share/rcm.sh.in +++ b/share/rcm.sh.in @@ -116,3 +116,9 @@ run_hooks() { done fi } + +: ${RCRC:=$HOME/.rcrc} + +if [ -r "$RCRC" ]; then + . "$RCRC" +fi |