From 7de557bf9c550623ce6493b8af940cb9b08c2293 Mon Sep 17 00:00:00 2001 From: Cassandra Fridkin Date: Mon, 5 Oct 2020 18:57:48 -0400 Subject: Move script to src/etc --- src/etc/pre-commit.sh | 22 ++++++++++++++++++++++ src/tools/install-git-hook/src/pre-commit.sh | 18 ------------------ 2 files changed, 22 insertions(+), 18 deletions(-) create mode 100755 src/etc/pre-commit.sh delete mode 100755 src/tools/install-git-hook/src/pre-commit.sh diff --git a/src/etc/pre-commit.sh b/src/etc/pre-commit.sh new file mode 100755 index 00000000000..32af70ec8d4 --- /dev/null +++ b/src/etc/pre-commit.sh @@ -0,0 +1,22 @@ +#!/bin/env bash +# +# Call `tidy --bless` before each commit +# Copy this scripts to .git/hooks to activate, +# and remove it from .git/hooks to deactivate. +# +# For help running bash scripts on Windows, +# see https://stackoverflow.com/a/6413405/6894799 +# + +set -Eeuo pipefail + +ROOT_DIR="$(git rev-parse --show-toplevel)"; +COMMAND="$ROOT_DIR/x.py test tidy --bless"; + +if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then + COMMAND="python $COMMAND" +fi + +echo "Running pre-commit script $COMMAND"; + +$COMMAND; diff --git a/src/tools/install-git-hook/src/pre-commit.sh b/src/tools/install-git-hook/src/pre-commit.sh deleted file mode 100755 index f47ca3e039a..00000000000 --- a/src/tools/install-git-hook/src/pre-commit.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# Call `tidy --bless` before each commit -# -# To enable this hook, run `./x.py run install-git-hook`. -# To disable it, run `./x.py run install-git-hook --remove` -set -Eeuo pipefail - -ROOT_DIR=$(git rev-parse --show-toplevel); -COMMAND="$ROOT_DIR/x.py test tidy --bless"; - -if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then - COMMAND="python $COMMAND" -fi - -echo "Running pre-commit script $COMMAND"; - -$COMMAND; -- cgit 1.4.1-3-g733a5