diff options
| author | Scott Bronson <b.git@u32.net> | 2008-03-15 10:44:40 -0700 |
|---|---|---|
| committer | Scott Bronson <b.git@u32.net> | 2008-03-17 00:03:23 -0700 |
| commit | 5ff7971fcef5f92d35f9ffc58358263f9cd9ba75 (patch) | |
| tree | 5007b0803fed00369af5b1b3ffdee7ed82130a14 | |
| parent | 3b3a5fa7b090b26996883c9f28145190b9cd2168 (diff) | |
$VCS rm .metadata instead of warning about its existence.
| -rwxr-xr-x | pre-commit.d/40rm-old-metadata | 11 | ||||
| -rwxr-xr-x | pre-commit.d/40warn-old-metadata | 7 |
2 files changed, 11 insertions, 7 deletions
diff --git a/pre-commit.d/40rm-old-metadata b/pre-commit.d/40rm-old-metadata new file mode 100755 index 0000000..8580516 --- /dev/null +++ b/pre-commit.d/40rm-old-metadata @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Remove the .metadata file if we're using .fix-metadata +if [ -f .metadata ] && [ -f .fix-metadata ]; then + # Don't want to do anything permanent if user is mistakenly + # running etckeeper without first setting VCS. + if [ "x$VCS" != "x" ]; then + $VCS rm .metadata + fi +fi diff --git a/pre-commit.d/40warn-old-metadata b/pre-commit.d/40warn-old-metadata deleted file mode 100755 index 374dd7b..0000000 --- a/pre-commit.d/40warn-old-metadata +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -set -e - -# Tell the user if the .metadata binary file is still lying around. -if [ -f .metadata ] && [ -f .fix-metadata ]; then - echo "etckeeper warning: The .metadata file is obsolete. You should delete it." >&2 -fi |