diff options
| -rw-r--r-- | NEWS.md.in | 2 | ||||
| -rwxr-xr-x | bin/lsrc.in | 5 | ||||
| -rwxr-xr-x | bin/mkrc.in | 14 | ||||
| -rwxr-xr-x | bin/rcdn.in | 7 | ||||
| -rwxr-xr-x | bin/rcup.in | 7 | ||||
| -rw-r--r-- | man/lsrc.1 | 6 | ||||
| -rw-r--r-- | man/mkrc.1 | 4 | ||||
| -rw-r--r-- | man/rcdn.1 | 5 | ||||
| -rw-r--r-- | man/rcm.7.mustache | 7 | ||||
| -rw-r--r-- | man/rcrc.5 | 7 | ||||
| -rw-r--r-- | man/rcup.1 | 5 | ||||
| -rw-r--r-- | share/rcm.sh.in | 18 | ||||
| -rw-r--r-- | test/Makefile.am | 37 | ||||
| -rw-r--r-- | test/lsrc-hostname.t | 4 | ||||
| -rw-r--r-- | test/mkrc-hostname.t | 9 | ||||
| -rw-r--r-- | test/rcrc-custom.t | 2 | ||||
| -rw-r--r-- | test/rcrc-hostname.t | 21 | ||||
| -rw-r--r-- | test/rcup-hostname.t | 14 |
18 files changed, 140 insertions, 34 deletions
@@ -4,6 +4,8 @@ rcm (@PACKAGE_VERSION@) unstable; urgency=low directory. Verbose hidden files for lsrc(1) (Javier López). * Allow running mkrc on a relative file and preserve the path (Pablo Olmos de Aguilera Corradini). + * A flag (-B), and a variable for rcrc(5) (HOSTNAME), for changing the + hostname as rcm sees it (Mike Burns). -- Mike Burns <mburns@thoughtbot.com> Fri, 28 Mar 2014 16:30:53 +0100 diff --git a/bin/lsrc.in b/bin/lsrc.in index c5ad700..760d769 100755 --- a/bin/lsrc.in +++ b/bin/lsrc.in @@ -227,8 +227,9 @@ handle_command_line() { local excludes= local includes= local symlink_dirs= + local hostname= - while getopts FVqvhI:x:S:t:d: opt; do + while getopts FVqvhI:x:B:S:t:d: opt; do case "$opt" in F) show_sigils=1;; h) show_help ;; @@ -240,11 +241,13 @@ handle_command_line() { V) version=1;; x) excludes="$excludes $OPTARG";; S) symlink_dirs="$symlink_dirs $OPTARG";; + B) hostname="$OPTARG";; esac done shift $(($OPTIND-1)) handle_common_flags lsrc $version $verbosity + HOSTNAME="$(determine_hostname "$hostname")" SHOW_SIGILS=$show_sigils TAGS="${arg_tags:-$TAGS}" DOTFILES_DIRS="${dotfiles_dirs:-$DOTFILES_DIRS}" diff --git a/bin/mkrc.in b/bin/mkrc.in index e8d3864..7cab210 100755 --- a/bin/mkrc.in +++ b/bin/mkrc.in @@ -9,6 +9,8 @@ destination() { local in_host=$3 local tag="$4" + $DEBUG "destination $dotfiles_dir $dotless $in_host $tag" + if [ "x$tag" != "x" ]; then echo "$dotfiles_dir/tag-$tag" elif [ $in_host = 1 ]; then @@ -36,13 +38,15 @@ for DOTFILES_DIR in $DOTFILES_DIRS $DEFAULT_DOTFILES_DIR; do done tag= +hostname= verbosity=0 in_host=0 version=0 always_copy=0 force_symlink=0 +install_args= -while getopts ChSsVvqot:d: opt; do +while getopts ChSsVvqot:d:B: opt; do case "$opt" in C) always_copy=1 ;; h) show_help ;; @@ -54,11 +58,17 @@ while getopts ChSsVvqot:d: opt; do V) version=1 ;; S) force_symlink=1 ;; s) force_symlink=0 ;; + B) + in_host=1 + hostname="$OPTARG" + install_args="-B $hostname" + ;; esac done shift $(($OPTIND-1)) handle_common_flags mkrc $version $verbosity +HOSTNAME="$(determine_hostname "$hostname")" if [ $in_host -eq 1 -a "x$tag" != "x" ]; then $ERROR 1 "Cannot specify both -o and -t" @@ -88,5 +98,5 @@ for file in $files; do $PRINT "Moving..." mv_v "$file" "$dest/$dotless" $PRINT "Linking..." - $INSTALL -d "$DOTFILES_DIR" -t "${tag:--}" "$dotless" + $INSTALL -d "$DOTFILES_DIR" -t "${tag:--}" $install_args "$dotless" done diff --git a/bin/rcdn.in b/bin/rcdn.in index 2ca6dae..e633f3e 100755 --- a/bin/rcdn.in +++ b/bin/rcdn.in @@ -37,10 +37,12 @@ handle_command_line() { local excludes= local includes= local symlink_dirs= + local hostname= - while getopts VqvhI:x:S:t:d: opt; do + while getopts VqvhI:x:S:t:d:B: opt; do case "$opt" in h) show_help ;; + B) hostname="$OPTARG" ;; I) includes="$includes $OPTARG";; k) run_hooks=1 ;; K) run_hooks=0 ;; @@ -56,6 +58,7 @@ handle_command_line() { shift $(($OPTIND-1)) handle_common_flags rcup $version $verbosity + hostname="$(determine_hostname "$hostname")" tags="${arg_tags:-$TAGS}" dotfiles_dirs="${dotfiles_dirs:-$DOTFILES_DIRS}" @@ -77,7 +80,7 @@ handle_command_line() { for symlink_dir in $symlink_dirs; do LS_ARGS="$LS_ARGS -S $symlink_dir" done - LS_ARGS="$LS_ARGS $files" + LS_ARGS="$LS_ARGS -B $hostname $files" $DEBUG "LS_ARGS: $LS_ARGS" } diff --git a/bin/rcup.in b/bin/rcup.in index 849a0f7..8e541e8 100755 --- a/bin/rcup.in +++ b/bin/rcup.in @@ -104,10 +104,12 @@ handle_command_line() { local includes= local always_copy=0 local symlink_dirs= + local hostname= REPLACE_ALL=0 - while getopts CVqvfhikKI:x:S:t:d: opt; do + while getopts CVqvfhikKI:x:S:t:d:B: opt; do case "$opt" in + B) hostname="$OPTARG" ;; C) always_copy=1 ;; d) dotfiles_dirs="$dotfiles_dirs $OPTARG" ;; f) REPLACE_ALL=1 ;; @@ -132,6 +134,7 @@ handle_command_line() { fi handle_common_flags rcup $version $verbosity + hostname="$(determine_hostname "$hostname")" tags="${arg_tags:-$TAGS}" DOTFILES_DIRS="${dotfiles_dirs:-$DOTFILES_DIRS}" @@ -153,7 +156,7 @@ handle_command_line() { for symlink_dir in $symlink_dirs; do LS_ARGS="$LS_ARGS -S $symlink_dir" done - LS_ARGS="$LS_ARGS $files" + LS_ARGS="$LS_ARGS -B $hostname $files" $DEBUG "LS_ARGS: $LS_ARGS" } @@ -12,6 +12,7 @@ .Op Fl t Ar tag .Op Fl x Ar excl_pat .Op Fl N Ar excl_pat +.Op Fl B Ar hostname .Op files ... .Sh DESCRIPTION This program lists all configuration files, both the sources in the @@ -26,6 +27,11 @@ section, for details on the directory layout. It supports these options: . .Bl -tag -width "-I excl_pat" +.It Fl B Ar HOSTNAME +treat +.Pa host-HOSTNAME +as the host-specific directory instead of computing it based on the +computer's hostname .It Fl d Ar DIR list dotfiles from the DIR. This can be specified multiple times. . @@ -9,6 +9,7 @@ .Op Fl Cvqo .Op Fl t Ar tag .Op Fl d Ar dir +.Op Fl B Ar hostname .Ar files ... .Sh DESCRIPTION This program adds files to your dotfiles directory then installs it @@ -18,6 +19,9 @@ different source directory. It supports these options: . .Bl -tag -width "-d DIR" +.It Fl B Ar HOSTNAME +use the supplied hostname instead of computing one. Implies +.Fl o . .It Fl C copy instead of symlinking when installing the rc file back into your home directory @@ -7,6 +7,7 @@ .Sh SYNOPSIS .Nm rcdn .Op Fl kKvq +.Op Fl B Ar hostname .Op Fl d Ar dir .Op Fl I Ar excl_pat .Op Fl t Ar tag @@ -43,6 +44,10 @@ These hooks are run each time is run and therefore must be idempotent. . .Bl -tag -width "-I EXCL_PAT" +.It Fl B Ar HOSTNAME +treat +.Pa host-HOSTNAME +as the host-specific directory instead of computing it .It Fl d Ar DIR remove rc files from the .Ar DIR . diff --git a/man/rcm.7.mustache b/man/rcm.7.mustache index 8956e5d..36dec50 100644 --- a/man/rcm.7.mustache +++ b/man/rcm.7.mustache @@ -213,6 +213,13 @@ dotfile directories listed in there are often specific to a single machine. .Pp .Dl mkrc -o .rcrc +.Pp +If your hostname is difficult to compute, or you otherwise want to use a +different hostname, you can use the +.Fl B +flag. +.Pp +.Dl mkrc -B eggplant .rcrc . .Sh RATIONALE The rcm suite was built as an abstraction over the shell, Ruby, Python, @@ -44,6 +44,12 @@ explained in detail in under the section .Sx EXCLUDE PATTERN . . +.It Va HOSTNAME +the hostname for this computer. This is normally computed using the +.Xr hostname 1 +command, but this command is non-standard and can prove unreliable. The +.Va HOSTNAME +variable forces a known hostname. .It Va TAGS the default tags. . @@ -62,6 +68,7 @@ under the section .Dl COPY_ALWAYS="*" .Dl DOTFILES_DIRS="/home/mike/.dotfiles /usr/share/dotfiles" .Dl EXCLUDES="irbrc *:*emacs* dotfiles:python*" +.Dl HOSTNAME="eggplant" .Dl TAGS="freebsd development email git laptop gmail notmuch" .Dl SYMLINK_DIRS="zprezto" .Sh SEE ALSO @@ -7,6 +7,7 @@ .Sh SYNOPSIS .Nm rcup .Op Fl CfikKqv +.Op Fl B Ar hostname .Op Fl d Ar dir .Op Fl I Ar excl_pat .Op Fl t Ar tag @@ -25,6 +26,10 @@ for details on the directory layout. .Pp It supports these options: .Bl -tag -width "-x EXCL_PAT" +.It Fl B Ar HOSTNAME +treat +.Pa host-HOSTNAME +as the host-specific directory instead of computing it .It Fl C copy the files instead of symlinking them .It Fl d Ar DIR diff --git a/share/rcm.sh.in b/share/rcm.sh.in index 809fca3..2ce68d4 100644 --- a/share/rcm.sh.in +++ b/share/rcm.sh.in @@ -12,7 +12,6 @@ DEFAULT_DOTFILES_DIR="$HOME/.dotfiles" MKDIR=mkdir INSTALL=rcup ROOT_DIR="$HOME" -HOSTNAME="$(hostname | sed -e 's/\..*//')" ln_v() { $VERBOSE "'$1' -> '$2'" @@ -96,15 +95,16 @@ handle_common_flags() { fi } -handle_metadata_flags() { - local arg_tags="$1" - local dotfiles_dirs="$2" +determine_hostname() { + local name="$1" - : ${TAGS:=$arg_tags} - : ${DOTFILES_DIRS:=$dotfiles_dirs} - - $DEBUG "TAGS: $TAGS" - $DEBUG "DOTFILES_DIRS: $DOTFILES_DIRS" + if [ -n "$name" ]; then + echo "$name" + elif [ -n "$HOSTNAME" ]; then + echo "$HOSTNAME" + else + echo "$(hostname | sed -e 's/\..*//')" + fi } run_hooks() { diff --git a/test/Makefile.am b/test/Makefile.am index 9cbc6b2..53dcf0b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,20 +1,23 @@ TESTS = \ - lsrc-dotfiles-dirs.t \ - lsrc-excludes.t \ - lsrc-hostname.t \ - lsrc-sigils.t \ - lsrc.t \ - lsrc-tags.t \ - lsrc-usage.t \ - mkrc-alternate-dotfiles-dir.t \ - mkrc-copy-file.t \ - mkrc-host-file.t \ - mkrc-simple-output.t \ - mkrc-tagged-file.t \ - mkrc-usage.t \ - rcrc-custom.t \ - rcrc.t \ - rcup-link-files.t \ - rcup-usage.t + lsrc-dotfiles-dirs.t \ + lsrc-excludes.t \ + lsrc-hostname.t \ + lsrc-sigils.t \ + lsrc.t \ + lsrc-tags.t \ + lsrc-usage.t \ + mkrc-alternate-dotfiles-dir.t \ + mkrc-copy-file.t \ + mkrc-host-file.t \ + mkrc-hostname.t \ + mkrc-simple-output.t \ + mkrc-tagged-file.t \ + mkrc-usage.t \ + rcrc-custom.t \ + rcrc-hostname.t \ + rcrc.t \ + rcup-link-files.t \ + rcup-hostname.t \ + rcup-usage.t LOG_COMPILER = cram diff --git a/test/lsrc-hostname.t b/test/lsrc-hostname.t index 9170c74..35ad0fe 100644 --- a/test/lsrc-hostname.t +++ b/test/lsrc-hostname.t @@ -11,3 +11,7 @@ Should include entries that match hostname $ lsrc /*/.example:/*/.dotfiles/example (glob) /*/.h-example:/*/.dotfiles/host-*/h-example (glob) + + $ lsrc -B not-hostname + /*/.example:/*/.dotfiles/example (glob) + /*/.nh-example:/*/.dotfiles/host-*/nh-example (glob) diff --git a/test/mkrc-hostname.t b/test/mkrc-hostname.t new file mode 100644 index 0000000..849af75 --- /dev/null +++ b/test/mkrc-hostname.t @@ -0,0 +1,9 @@ + $ . "$TESTDIR/helper.sh" + +Able to override the hostname + + $ touch .example + + $ mkrc -B another_thing .example >/dev/null + + $ assert_linked "$HOME/.example" "$HOME/.dotfiles/host-another_thing/example" diff --git a/test/rcrc-custom.t b/test/rcrc-custom.t index 658099d..9c1c7a3 100644 --- a/test/rcrc-custom.t +++ b/test/rcrc-custom.t @@ -1,6 +1,6 @@ $ . "$TESTDIR/helper.sh" -mkrc should accept -r for a custom rcrc +mkrc should accept a custom rcrc $ touch .example > mkdir .other-dotfiles diff --git a/test/rcrc-hostname.t b/test/rcrc-hostname.t new file mode 100644 index 0000000..1008cd9 --- /dev/null +++ b/test/rcrc-hostname.t @@ -0,0 +1,21 @@ + $ . "$TESTDIR/helper.sh" + +The hostname can be set in ~/.rcrc + + $ touch .dotfiles/example + > mkdir .dotfiles/host-$(hostname) + > touch .dotfiles/host-$(hostname)/h-example + > mkdir .dotfiles/host-eggplant_firetruck + > touch .dotfiles/host-eggplant_firetruck/nh-example + > mkdir .dotfiles/host-haircut_hammer + > touch .dotfiles/host-haircut_hammer/nh-example + + $ echo 'HOSTNAME="eggplant_firetruck"' > $HOME/.rcrc + + $ lsrc + /*/.example:/*/.dotfiles/example (glob) + /*/.nh-example:/*/.dotfiles/host-eggplant_firetruck/nh-example (glob) + + $ lsrc -B haircut_hammer + /*/.example:/*/.dotfiles/example (glob) + /*/.nh-example:/*/.dotfiles/host-haircut_hammer/nh-example (glob) diff --git a/test/rcup-hostname.t b/test/rcup-hostname.t new file mode 100644 index 0000000..b85dbb8 --- /dev/null +++ b/test/rcup-hostname.t @@ -0,0 +1,14 @@ + $ . "$TESTDIR/helper.sh" + +Should create symlinks for files and directories in the hostname + + $ touch .dotfiles/example + > mkdir .dotfiles/host-awesome_host/ + > touch .dotfiles/host-awesome_host/example2 + > mkdir .dotfiles/host-$(hostname)/ + > touch .dotfiles/host-$(hostname)/example3 + + $ rcup -B awesome_host > /dev/null + + $ assert_linked "$HOME/.example" "$HOME/.dotfiles/example" + $ assert_linked "$HOME/.example2" "$HOME/.dotfiles/host-awesome_host/example2" |