From 9b4d973cc3bb5ddee00b1c20ef5f1edec8f9ac3a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Nov 2007 23:45:43 -0500 Subject: renumber --- init.d/05restore-etckeeper | 8 -------- init.d/10restore-etckeeper | 8 ++++++++ init.d/10restore-metadata | 10 ---------- init.d/20git-init | 6 ------ init.d/20restore-metadata | 10 ++++++++++ init.d/30git-perm | 3 --- init.d/40git-ignore | 14 -------------- init.d/40git-init | 6 ++++++ init.d/40git-pre-commit-hook | 15 --------------- init.d/50git-add | 5 ----- init.d/50git-ignore | 14 ++++++++++++++ init.d/50git-perm | 3 +++ init.d/50git-pre-commit-hook | 15 +++++++++++++++ init.d/70git-add | 5 +++++ post-apt.d/30git-add | 5 +++++ post-apt.d/40git-rm | 10 ++++++++++ post-apt.d/50git-add | 5 ----- post-apt.d/50git-commit | 9 +++++++++ post-apt.d/60git-rm | 10 ---------- post-apt.d/75git-commit | 9 --------- pre-commit.d/10store-empty-directory | 19 ------------------- pre-commit.d/10warn-hardlinks | 7 ------- pre-commit.d/10warn-special-file | 9 --------- pre-commit.d/20store-empty-directory | 19 +++++++++++++++++++ pre-commit.d/20store-metadata | 18 ------------------ pre-commit.d/20warn-hardlinks | 7 +++++++ pre-commit.d/20warn-special-file | 9 +++++++++ pre-commit.d/30store-metadata | 18 ++++++++++++++++++ 28 files changed, 138 insertions(+), 138 deletions(-) delete mode 100755 init.d/05restore-etckeeper create mode 100755 init.d/10restore-etckeeper delete mode 100755 init.d/10restore-metadata delete mode 100755 init.d/20git-init create mode 100755 init.d/20restore-metadata delete mode 100755 init.d/30git-perm delete mode 100755 init.d/40git-ignore create mode 100755 init.d/40git-init delete mode 100755 init.d/40git-pre-commit-hook delete mode 100755 init.d/50git-add create mode 100755 init.d/50git-ignore create mode 100755 init.d/50git-perm create mode 100755 init.d/50git-pre-commit-hook create mode 100755 init.d/70git-add create mode 100755 post-apt.d/30git-add create mode 100755 post-apt.d/40git-rm delete mode 100755 post-apt.d/50git-add create mode 100755 post-apt.d/50git-commit delete mode 100755 post-apt.d/60git-rm delete mode 100755 post-apt.d/75git-commit delete mode 100755 pre-commit.d/10store-empty-directory delete mode 100755 pre-commit.d/10warn-hardlinks delete mode 100755 pre-commit.d/10warn-special-file create mode 100755 pre-commit.d/20store-empty-directory delete mode 100755 pre-commit.d/20store-metadata create mode 100755 pre-commit.d/20warn-hardlinks create mode 100755 pre-commit.d/20warn-special-file create mode 100755 pre-commit.d/30store-metadata diff --git a/init.d/05restore-etckeeper b/init.d/05restore-etckeeper deleted file mode 100755 index 376524c..0000000 --- a/init.d/05restore-etckeeper +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -# Yes, this runs code from the repository. As documented, etckeeper-init -# should only be run on repositories you trust. -if [ -e .etckeeper ]; then - . ./.etckeeper -fi diff --git a/init.d/10restore-etckeeper b/init.d/10restore-etckeeper new file mode 100755 index 0000000..376524c --- /dev/null +++ b/init.d/10restore-etckeeper @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +# Yes, this runs code from the repository. As documented, etckeeper-init +# should only be run on repositories you trust. +if [ -e .etckeeper ]; then + . ./.etckeeper +fi diff --git a/init.d/10restore-metadata b/init.d/10restore-metadata deleted file mode 100755 index cd6174c..0000000 --- a/init.d/10restore-metadata +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e - -# Note that metastore doesn't check that the .metastore file only changes -# perms of files in the current directory. It's ok to trust the .metastore -# file won't do anything shady, because, as documented, etckeeper-init -# should only be run on repositories you trust. -if [ -e .metadata ]; then - metastore --apply -fi diff --git a/init.d/20git-init b/init.d/20git-init deleted file mode 100755 index 69867c4..0000000 --- a/init.d/20git-init +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -e -if [ ! -e .git ]; then - git-init - echo "$(hostname) /etc repository" > .git/description -fi diff --git a/init.d/20restore-metadata b/init.d/20restore-metadata new file mode 100755 index 0000000..cd6174c --- /dev/null +++ b/init.d/20restore-metadata @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +# Note that metastore doesn't check that the .metastore file only changes +# perms of files in the current directory. It's ok to trust the .metastore +# file won't do anything shady, because, as documented, etckeeper-init +# should only be run on repositories you trust. +if [ -e .metadata ]; then + metastore --apply +fi diff --git a/init.d/30git-perm b/init.d/30git-perm deleted file mode 100755 index 564e489..0000000 --- a/init.d/30git-perm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -e -chmod 700 .git diff --git a/init.d/40git-ignore b/init.d/40git-ignore deleted file mode 100755 index 88866cf..0000000 --- a/init.d/40git-ignore +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -set -e -if [ ! -e .gitignore ]; then - cat >.gitignore < .git/description +fi diff --git a/init.d/40git-pre-commit-hook b/init.d/40git-pre-commit-hook deleted file mode 100755 index 0efd5e4..0000000 --- a/init.d/40git-pre-commit-hook +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -set -e -if [ -x .git/hooks/pre-commit ]; then - if ! grep -q "etckeeper pre-commit" .git/hooks/pre-commit; then - echo "etckeeper warning: .git/hooks/pre-commit needs to be manually modifed to run: etckeeper pre-commit `pwd`" >&2 - fi -else - cat >.git/hooks/pre-commit <&2 -fi diff --git a/init.d/50git-ignore b/init.d/50git-ignore new file mode 100755 index 0000000..88866cf --- /dev/null +++ b/init.d/50git-ignore @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +if [ ! -e .gitignore ]; then + cat >.gitignore <&2 + fi +else + cat >.git/hooks/pre-commit <&2 +fi diff --git a/post-apt.d/30git-add b/post-apt.d/30git-add new file mode 100755 index 0000000..06504b4 --- /dev/null +++ b/post-apt.d/30git-add @@ -0,0 +1,5 @@ +#!/bin/sh +set -e +if ! git-add .; then + echo "etckeeper warning: git-add failed" >&2 +fi diff --git a/post-apt.d/40git-rm b/post-apt.d/40git-rm new file mode 100755 index 0000000..4a47435 --- /dev/null +++ b/post-apt.d/40git-rm @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +TAB=" " + +for file in $(git ls-files --deleted); do + if [ ! -d "$file" ]; then + git rm "$file" + fi +done diff --git a/post-apt.d/50git-add b/post-apt.d/50git-add deleted file mode 100755 index 06504b4..0000000 --- a/post-apt.d/50git-add +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -set -e -if ! git-add .; then - echo "etckeeper warning: git-add failed" >&2 -fi diff --git a/post-apt.d/50git-commit b/post-apt.d/50git-commit new file mode 100755 index 0000000..30ef0f2 --- /dev/null +++ b/post-apt.d/50git-commit @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +# TODO: figure out what packages were acted on by the apt run, and include +# that info in the commit message +message="committing changes after apt run" + +# ignore exit code since it exits nonzero if there is nothing to do +git commit -m "$message" || true diff --git a/post-apt.d/60git-rm b/post-apt.d/60git-rm deleted file mode 100755 index 4a47435..0000000 --- a/post-apt.d/60git-rm +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e - -TAB=" " - -for file in $(git ls-files --deleted); do - if [ ! -d "$file" ]; then - git rm "$file" - fi -done diff --git a/post-apt.d/75git-commit b/post-apt.d/75git-commit deleted file mode 100755 index 30ef0f2..0000000 --- a/post-apt.d/75git-commit +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -set -e - -# TODO: figure out what packages were acted on by the apt run, and include -# that info in the commit message -message="committing changes after apt run" - -# ignore exit code since it exits nonzero if there is nothing to do -git commit -m "$message" || true diff --git a/pre-commit.d/10store-empty-directory b/pre-commit.d/10store-empty-directory deleted file mode 100755 index e0f9538..0000000 --- a/pre-commit.d/10store-empty-directory +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -set -e - -# Make sure the file is not readable by others, since it can leak -# information about contents of non-readable directories in /etc. -umask 077 - -if [ -e .etckeeper ]; then - egrep -v '^mkdir ' .etckeeper > .etckeeper.new || true -fi -find -type d -empty | grep -v /.git/ | sort | - sed -e "s/^/mkdir -p '/" -e "s/\$/'/" >> .etckeeper.new - -if [ ! -e .etckeeper ] || ! cmp -s .etckeeper .etckeeper.new ; then - mv -f .etckeeper.new .etckeeper - git add .etckeeper -else - rm -f .etckeeper.new -fi diff --git a/pre-commit.d/10warn-hardlinks b/pre-commit.d/10warn-hardlinks deleted file mode 100755 index 3dd7a96..0000000 --- a/pre-commit.d/10warn-hardlinks +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -set -e -hardlinks=$(find -type f -not -links 1 | grep -v /.git/) || true -if [ -n "$hardlinks" ]; then - echo "etckeeper warning: hardlinked files could cause problems with git:" >&2 - echo "$hardlinks" >&2 -fi diff --git a/pre-commit.d/10warn-special-file b/pre-commit.d/10warn-special-file deleted file mode 100755 index cb4d019..0000000 --- a/pre-commit.d/10warn-special-file +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -set -e -special=$(find -not -type d -not -type f -not -type l | grep -v /.git/) || true -if [ -n "$special" ]; then - echo "etckeeper warning: special files could cause problems with git:" >&2 - echo "$special" >&2 -fi - -true diff --git a/pre-commit.d/20store-empty-directory b/pre-commit.d/20store-empty-directory new file mode 100755 index 0000000..e0f9538 --- /dev/null +++ b/pre-commit.d/20store-empty-directory @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +# Make sure the file is not readable by others, since it can leak +# information about contents of non-readable directories in /etc. +umask 077 + +if [ -e .etckeeper ]; then + egrep -v '^mkdir ' .etckeeper > .etckeeper.new || true +fi +find -type d -empty | grep -v /.git/ | sort | + sed -e "s/^/mkdir -p '/" -e "s/\$/'/" >> .etckeeper.new + +if [ ! -e .etckeeper ] || ! cmp -s .etckeeper .etckeeper.new ; then + mv -f .etckeeper.new .etckeeper + git add .etckeeper +else + rm -f .etckeeper.new +fi diff --git a/pre-commit.d/20store-metadata b/pre-commit.d/20store-metadata deleted file mode 100755 index b878abd..0000000 --- a/pre-commit.d/20store-metadata +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -set -e - -# Make sure the file is not readable by others, since it can leak -# information about contents of non-readable directories in /etc. -umask 077 - -# ensure the file exists so that it will list its own metadata -if [ ! -e .metadata ]; then - metastore --save -fi - -# metastore doesn't produce the same output file for the same metadata -# everytime, so avoid changing the file if nothing really changed. -if [ ! -z "$(metastore --compare)" ]; then - metastore --save - git add .metadata -fi diff --git a/pre-commit.d/20warn-hardlinks b/pre-commit.d/20warn-hardlinks new file mode 100755 index 0000000..3dd7a96 --- /dev/null +++ b/pre-commit.d/20warn-hardlinks @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +hardlinks=$(find -type f -not -links 1 | grep -v /.git/) || true +if [ -n "$hardlinks" ]; then + echo "etckeeper warning: hardlinked files could cause problems with git:" >&2 + echo "$hardlinks" >&2 +fi diff --git a/pre-commit.d/20warn-special-file b/pre-commit.d/20warn-special-file new file mode 100755 index 0000000..cb4d019 --- /dev/null +++ b/pre-commit.d/20warn-special-file @@ -0,0 +1,9 @@ +#!/bin/sh +set -e +special=$(find -not -type d -not -type f -not -type l | grep -v /.git/) || true +if [ -n "$special" ]; then + echo "etckeeper warning: special files could cause problems with git:" >&2 + echo "$special" >&2 +fi + +true diff --git a/pre-commit.d/30store-metadata b/pre-commit.d/30store-metadata new file mode 100755 index 0000000..b878abd --- /dev/null +++ b/pre-commit.d/30store-metadata @@ -0,0 +1,18 @@ +#!/bin/sh +set -e + +# Make sure the file is not readable by others, since it can leak +# information about contents of non-readable directories in /etc. +umask 077 + +# ensure the file exists so that it will list its own metadata +if [ ! -e .metadata ]; then + metastore --save +fi + +# metastore doesn't produce the same output file for the same metadata +# everytime, so avoid changing the file if nothing really changed. +if [ ! -z "$(metastore --compare)" ]; then + metastore --save + git add .metadata +fi -- cgit v1.2.3