summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorGravatar Christian Höltje <docwhat@gerf.org>2015-03-18 22:45:22 -0400
committerGravatar Mike Burns <mike@mike-burns.com>2015-06-05 11:23:38 +0200
commit9a3f6cc532080a5b7095037835f778c9a621f642 (patch)
tree5c5ce89c02c0bc65776ab6a0628eda246891b36f /bin
parentaec2af1e243054ba864279889468379ad0784e63 (diff)
Changes the priority to: hosts->tags->default
This changes the order that things are pulled in so that: 1. Hosts take priority over everything. 2. Tags take priority over default. 3. Default takes priority over nothing. Closes #94
Diffstat (limited to 'bin')
-rwxr-xr-xbin/lsrc.in29
1 files changed, 14 insertions, 15 deletions
diff --git a/bin/lsrc.in b/bin/lsrc.in
index ada436b..47ae889 100755
--- a/bin/lsrc.in
+++ b/bin/lsrc.in
@@ -323,21 +323,6 @@ for DOTFILES_DIR in $DOTFILES_DIRS; do
cd "$DOTFILES_DIR"
DIR_STACK=":$DOTFILES_DIR"
- for file in ${FILES:-*}; do
- dotted=0
- if is_metafile "$file"; then
- continue
- fi
-
- if is_excluded "$file" "$undotted_file_globs" "$never_undotted_file_globs"; then
- dotted=1
- fi
-
- handle_file "$file" "$DEST_DIR" "$DOTFILES_DIR" . "$dotted" "$exclude_file_globs" "$include_file_globs" "$symlink_dirs_file_globs" "$mk_dirs_file_globs"
- done
-
- cd "$DOTFILES_DIR"
-
host_files="$DOTFILES_DIR/host-$HOSTNAME"
if [ -d "$host_files" ]; then
pushdir "$(basename "$host_files")"
@@ -369,4 +354,18 @@ for DOTFILES_DIR in $DOTFILES_DIRS; do
fi
done
+ cd "$DOTFILES_DIR"
+
+ for file in ${FILES:-*}; do
+ dotted=0
+ if is_metafile "$file"; then
+ continue
+ fi
+
+ if is_excluded "$file" "$undotted_file_globs" "$never_undotted_file_globs"; then
+ dotted=1
+ fi
+
+ handle_file "$file" "$DEST_DIR" "$DOTFILES_DIR" . "$dotted" "$exclude_file_globs" "$include_file_globs" "$symlink_dirs_file_globs" "$mk_dirs_file_globs"
+ done
done