diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-15 12:41:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-15 12:41:45 -0400 |
| commit | 86050dadf4a6ddef13e4a2bf6bf4306a6d73100b (patch) | |
| tree | a8c4e312dbac70aa53a9666c9c4055c1d653cdd2 | |
| parent | 5d4fc876ad92b3f2844debade49484b862799dcc (diff) | |
| parent | 6a7d16317167fc4de57c507aead81d7651ac9481 (diff) | |
Merge branch 'master' of https://github.com/pommi/etckeeper
| -rwxr-xr-x | uninit.d/50vcs-uninit | 2 | ||||
| -rwxr-xr-x | update-ignore.d/01update-ignore | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/uninit.d/50vcs-uninit b/uninit.d/50vcs-uninit index b61abfd..b330f1b 100755 --- a/uninit.d/50vcs-uninit +++ b/uninit.d/50vcs-uninit @@ -32,7 +32,7 @@ else file=$($tempfile) otherentries= skipping= - while read line; do + while read -r line; do if echo "$line" | grep -q "$managed_by_etckeeper"; then if [ ! "$skipping" ]; then skipping=1 diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore index d88ff07..528ff8a 100755 --- a/update-ignore.d/01update-ignore +++ b/update-ignore.d/01update-ignore @@ -181,7 +181,7 @@ if [ -e "$file" ]; then file=$($tempfile) ( skipping= - while read line; do + while read -r line; do if echo "$line" | grep -q "$managed_by_etckeeper"; then if [ ! "$skipping" ]; then skipping=1 |