summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Mike Burns <mike@mike-burns.com>2013-08-11 15:48:07 +0200
committerGravatar Mike Burns <mike@mike-burns.com>2013-08-11 15:48:07 +0200
commit0fbc27dbe296e03b4001586a7e29780328cbc657 (patch)
treedf0e2c654f4235939fdc37def18f6baf92e43081
parent63ab42206f25e181f626ec0c7ddad045fa27846c (diff)
Change `-e` to `-x`
Since the `-e` flag was for exclude patterns, and since it's rare for a word with an `x` to come along, change the `-e` flag to `-x`. Better to do it now before a new release.
-rwxr-xr-xbin/lsrc6
-rwxr-xr-xbin/rcdn8
-rwxr-xr-xbin/rcup8
-rw-r--r--man/lsrc.116
-rw-r--r--man/rcdn.118
-rw-r--r--man/rcm.74
-rw-r--r--man/rcup.118
7 files changed, 39 insertions, 39 deletions
diff --git a/bin/lsrc b/bin/lsrc
index 9ed2a71..880bf05 100755
--- a/bin/lsrc
+++ b/bin/lsrc
@@ -151,15 +151,15 @@ handle_command_line() {
local excludes=
local includes=
- while getopts VqvI:e:t:d: opt; do
+ while getopts VqvI:x:t:d: opt; do
case "$opt" in
- e) excludes="$excludes $OPTARG";;
I) includes="$includes $OPTARG";;
t) arg_tags="$arg_tags $OPTARG";;
v) verbosity=$(($verbosity + 1));;
q) verbosity=$(($verbosity - 1));;
d) dotfiles_dirs="$dotfiles_dirs $OPTARG";;
- V) version=1
+ V) version=1;;
+ x) excludes="$excludes $OPTARG";;
esac
done
shift $(($OPTIND-1))
diff --git a/bin/rcdn b/bin/rcdn
index 99812aa..df882e8 100755
--- a/bin/rcdn
+++ b/bin/rcdn
@@ -26,15 +26,15 @@ handle_command_line() {
local excludes=
local includes=
- while getopts VqvI:e:t:d: opt; do
+ while getopts VqvI:x:t:d: opt; do
case "$opt" in
- e) excludes="$excludes $OPTARG";;
I) includes="$includes $OPTARG";;
t) arg_tags="$arg_tags $OPTARG" ;;
v) verbosity=$(($verbosity + 1));;
q) verbosity=$(($verbosity - 1));;
d) dotfiles_dirs="$dotfiles_dirs $OPTARG" ;;
- V) version=1
+ V) version=1 ;;
+ x) excludes="$excludes $OPTARG" ;;
esac
done
shift $(($OPTIND-1))
@@ -52,7 +52,7 @@ handle_command_line() {
LS_ARGS="$LS_ARGS -d $dotfiles_dir"
done
for exclude in $excludes; do
- LS_ARGS="$LS_ARGS -e $exclude"
+ LS_ARGS="$LS_ARGS -x $exclude"
done
for include in $includes; do
LS_ARGS="$LS_ARGS -I $include"
diff --git a/bin/rcup b/bin/rcup
index df9adac..af7a012 100755
--- a/bin/rcup
+++ b/bin/rcup
@@ -80,18 +80,18 @@ handle_command_line() {
local always_copy=0
REPLACE_ALL=0
- while getopts CVqvfiI:e:t:d: opt; do
+ while getopts CVqvfiI:x:t:d: opt; do
case "$opt" in
C) always_copy=1 ;;
d) dotfiles_dirs="$dotfiles_dirs $OPTARG" ;;
- e) excludes="$excludes $OPTARG" ;;
f) REPLACE_ALL=1 ;;
i) REPLACE_ALL=0 ;;
I) includes="$includes $OPTARG" ;;
q) verbosity=$(($verbosity - 1)) ;;
t) arg_tags="$arg_tags $OPTARG" ;;
v) verbosity=$(($verbosity + 1)) ;;
- V) version=1
+ V) version=1 ;;
+ x) excludes="$excludes $OPTARG" ;;
esac
done
shift $(($OPTIND-1))
@@ -113,7 +113,7 @@ handle_command_line() {
LS_ARGS="$LS_ARGS -d $dotfiles_dir"
done
for exclude in $excludes; do
- LS_ARGS="$LS_ARGS -e $exclude"
+ LS_ARGS="$LS_ARGS -x $exclude"
done
for include in $includes; do
LS_ARGS="$LS_ARGS -I $include"
diff --git a/man/lsrc.1 b/man/lsrc.1
index fb48680..f8e675c 100644
--- a/man/lsrc.1
+++ b/man/lsrc.1
@@ -8,9 +8,9 @@
.Nm lsrc
.Op Fl vq
.Op Fl d Ar dir
-.Op Fl e Ar excl_pat
.Op Fl I Ar excl_pat
.Op Fl t Ar tag
+.Op Fl x Ar excl_pat
.Op files ...
.Sh DESCRIPTION
This program lists all configuration files, both the sources in the
@@ -31,17 +31,12 @@ list dotfiles according to TAG
.It Fl d Ar DIR
list dotfiles from the DIR. This can be specified multiple times.
.
-.It Fl e Ar excl_pat
-exclude the files that match the given pattern. See
-.Sx EXCLUDE PATTERN
-for more details. This option can be repeated.
-.
.It Fl I Ar excl_pat
include the files that match the given pattern. This is applied after
any
-.Fl e
+.Fl x
options. It uses the same pattern language as
-.Fl e ;
+.Fl x ;
more details are in the
.Sx EXCLUDE PATTERN
section.
@@ -51,6 +46,11 @@ increase verbosity. This can be repeated for extra verbosity.
.It Fl q
decrease verbosity
.
+.It Fl x Ar excl_pat
+exclude the files that match the given pattern. See
+.Sx EXCLUDE PATTERN
+for more details. This option can be repeated.
+.
.It Ar files ...
only list the specified file(s)
.El
diff --git a/man/rcdn.1 b/man/rcdn.1
index d61707e..2981bbc 100644
--- a/man/rcdn.1
+++ b/man/rcdn.1
@@ -8,9 +8,9 @@
.Nm rcdn
.Op Fl vq
.Op Fl d Ar dir
-.Op Fl e Ar excl_pat
.Op Fl I Ar excl_pat
.Op Fl t Ar tag
+.Op Fl x Ar excl_pat
.Op Ar files ...
.Sh DESCRIPTION
This program will remove all the rc file symlinks that the
@@ -25,18 +25,11 @@ flags.
remove rc files from the
.Ar DIR .
This can be specified multiple times.
-.It Fl e Ar EXCL_PAT
-do not remove rc files that match
-.Ar EXCL_PAT .
-This can be repeated with additional patterns. See
-.Xr lsrc 1 ,
-.Sx EXCLUDE PATTERN ,
-for more details.
.It Fl I Ar EXCL_PAT
remove rc files that match
.Ar EXCL_PAT
despite being excluded by the
-.Fl e
+.Fl x
flag or a setting in
.Xr rcrc 5 .
This can be repeated with additional patterns. See
@@ -50,6 +43,13 @@ remove dotfiles according to
.Ar TAG
.It Fl v
increase verbosity. This can be repeated for extra verbosity.
+.It Fl x Ar EXCL_PAT
+do not remove rc files that match
+.Ar EXCL_PAT .
+This can be repeated with additional patterns. See
+.Xr lsrc 1 ,
+.Sx EXCLUDE PATTERN ,
+for more details.
.It Ar files
only remove the specified file(s)
.El
diff --git a/man/rcm.7 b/man/rcm.7
index 3a9f659..ff94a70 100644
--- a/man/rcm.7
+++ b/man/rcm.7
@@ -85,7 +85,7 @@ or
symlink to be created in your home
directory. Use an exclusion pattern to ignore these.
.Pp
-.Dl rcup -e install -e Rakefile -e Makefile -e install.sh
+.Dl rcup -x install -x Rakefile -x Makefile -x install.sh
.Ss COMMON PROBLEM: DOTTED FILENAMES IN DOTFILES DIRECTORY
A less common situation is for all the filenames in your dotfiles
directory to be prefixed with a period. These files are skipped by the
@@ -202,7 +202,7 @@ will take precedence over
.Pp
An exclusion pattern can be tied to a specific dotfiles directory.
.Pp
-.Dl rcup -d .dotfiles -d work-dotfiles -e 'work-dotfiles:powrc'
+.Dl rcup -d .dotfiles -d work-dotfiles -x 'work-dotfiles:powrc'
.
.Sh HOST-SPECIFIC DOTFILES
You can also mark host-specific files. This will go by the hostname. The
diff --git a/man/rcup.1 b/man/rcup.1
index e8f646a..0b265ab 100644
--- a/man/rcup.1
+++ b/man/rcup.1
@@ -8,9 +8,9 @@
.Nm rcup
.Op Fl Cfiqv
.Op Fl d Ar dir
-.Op Fl e Ar excl_pat
.Op Fl I Ar excl_pat
.Op Fl t Ar tag
+.Op Fl x Ar excl_pat
.Op Ar files ...
.Sh DESCRIPTION
This is a program to update and install personal dotfiles. These
@@ -31,13 +31,6 @@ copy the files instead of symlinking them
install dotfiles from the
.Ar DIR .
This can be specified multiple times.
-.It Fl e Ar EXCL_PAT
-do not install rc files that match
-.Ar EXCL_PAT .
-This can be repeated with additional patterns. See
-.Xr lsrc 1 ,
-.Sx EXCLUDE PATTERN ,
-for more details.
.It Fl f
If the rc file already exists in your home directory but does not match
the file in your dotfiles directory, remove the rc file then create the
@@ -50,7 +43,7 @@ is the default
install rc files that match
.Ar EXCL_PAT
despite being excluded by the
-.Fl e
+.Fl x
flag or a setting in
.Xr rcrc 5 .
This can be repeated with additional patterns. See
@@ -64,6 +57,13 @@ install dotfiles according to
decrease verbosity
.It Fl v
increase verbosity. This can be repeated for extra verbosity.
+.It Fl x Ar EXCL_PAT
+do not install rc files that match
+.Ar EXCL_PAT .
+This can be repeated with additional patterns. See
+.Xr lsrc 1 ,
+.Sx EXCLUDE PATTERN ,
+for more details.
.It Ar files
only install the specified file(s)
.El