diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-03-14 21:31:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-03-14 21:31:48 -0400 |
| commit | 7190864de465c3c3b015540ca45c9d9bccb5b790 (patch) | |
| tree | 017983b755b90aea72e23c84c3b23a13fef7fb58 | |
| parent | 94cacc84d322429e70485dea49bb858f48aa26c8 (diff) | |
more stuff
| -rw-r--r-- | modules/blobs/commit.d.sh | 5 | ||||
| -rw-r--r-- | wrapper/runcmd.mk | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/modules/blobs/commit.d.sh b/modules/blobs/commit.d.sh index 08e9698..458f98e 100644 --- a/modules/blobs/commit.d.sh +++ b/modules/blobs/commit.d.sh @@ -31,7 +31,10 @@ main() { cd "$dir" shopt -s dotglob nullglob for file in *; do - id="$("$RVS" commit "$file")" + if [[ "$RVS_REPO" -ef "$file" ]]; then + continue + fi + id="$("$RVS" commit "$file" 2>/dev/null)" stat -c $'%a\t%u (%U)\t%g (%G)\t' -- "$file" printf $'%s\t%s\n' "$id" "$file" done > "$tmpfile" diff --git a/wrapper/runcmd.mk b/wrapper/runcmd.mk index cdfa897..40e791e 100644 --- a/wrapper/runcmd.mk +++ b/wrapper/runcmd.mk @@ -11,6 +11,6 @@ export OUTPUT_DIR := $(realpath .) $(MAKECMDGOALS): % : $(EXEC_PATH)/modules/% mkdir -p -- '$(@D)' - (cd $(CWD) && '$<' $(ARGS)) | tee -- '$@' | sed 's,^,$@:,' >&2 + { (cd $(CWD) && '$<' $(ARGS)) | tee -- '$@' >&2; } 2>&1 | sed 's,^,$@:,' >&2 include $(wildcard $(EXEC_PATH)/modules/*.mk) |