improvements

3 files changed, 17 insertions, 2 deletions

diff --git a/etckeeper b/etckeeper
index 539e880..dd44b02 100755
--- a/etckeeper
+++ b/etckeeper
@@ -1,15 +1,19 @@
 #!/bin/sh
 set -e
 
-if [ "$0" != etckeeper ]; then
+if [ "$(basename $0)" != etckeeper ]; then
 	command="$(basename $0 | sed -e s/etckeeper-//)"
 else
+	if [ -z "$1" ]; then
+		echo "usage: etckeeper command" >&2
+		exit 1
+	fi
 	command="$1"
 	shift 1
 fi
 
 if [ ! -d "/etc/etckeeper/$command.d" ]; then
-	echo "/etc/etckeeper/$command.d does not exist" >&2
+	echo "etckeeper: /etc/etckeeper/$command.d does not exist" >&2
 	exit 1
 fi
 
diff --git a/init.d/50git-add b/init.d/50git-add
new file mode 100755
index 0000000..903e5aa
--- /dev/null
+++ b/init.d/50git-add
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+cd /etc
+if ! git-add .; then
+	echo "etckeeper warning: git-add failed" >&2
+fi
diff --git a/pre-commit.d/30git-perm b/pre-commit.d/30git-perm
new file mode 100755
index 0000000..7a0bfa9
--- /dev/null
+++ b/pre-commit.d/30git-perm
@@ -0,0 +1,5 @@
+#!/bin/sh
+# etckeeper-init should have taken care of this, but as a paranoia
+# measure, make sure .git is not world readable
+set -e
+chmod 700 .git