Commit c84ba83f authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Shuffled command checks about a bit

parent 0cbfd249

git-hooks

+14 −9
Original line number Diff line number Diff line
@@ -88,12 +88,17 @@ _basic_check () 
		     run 'git-hooks init'"

}



_add_remove_check ()

_change_check ()

{

	_basic_check

	[ -w "$GIT_DIR"/hooks/$hook.d ] || \

		die "you do not have permissions to add the script to \

		     $GIT_DIR/hooks/$hook.d"

		die "you do not have permissions to add, remove or change the scripts \

		     in $GIT_DIR/hooks/$hook.d"

}



_installed_check ()

{

	[ -e "$GIT_DIR"/hooks/$hook.d/"$script" ] || \

		die "there is no script '$script' in the '$hook' hook directory"

}



cmd_add ()
@@ -103,7 +108,8 @@ cmd_add () 
	add_option hook yes

	add_option script yes

	parse_args "$@" || return

	_add_remove_check

	_basic_check

	_change_check



	[ -e "$script" ] || die "unknown script '$script'"

	[ -e "$GIT_DIR"/hooks/$hook.d/"`basename "$script"`" ] && \
@@ -120,10 +126,9 @@ cmd_remove () 
	add_option hook yes

	add_option script yes

	parse_args "$@" || return

	_add_remove_check



	[ -e "$GIT_DIR"/hooks/$hook.d/"$script" ] || \

		die "there is no script '$script' in the '$hook' hook directory"

	_basic_check

	_change_check

	_installed_check



	rm "$GIT_DIR"/hooks/$hook.d/"$script"

}