1
mirror of https://git.dn42.dev/dn42/registry.git synced 2025-01-11 15:46:22 +01:00

add quotes to prevent globbing

This commit is contained in:
xuu 2017-12-07 15:02:05 -07:00
parent 838cd85ee2
commit d4ba51cf46
No known key found for this signature in database
GPG Key ID: 8B3B0604F164E04F

View File

@ -10,16 +10,14 @@ clean_up() {
git merge --abort > /dev/null
}
(git merge HEAD || clean_up) > /dev/null
git pull --ff-only > /dev/null
if ! git config remote.$1.url > /dev/null; then
git remote add $1 git@git.dn42:$1/registry.git
if ! git config "remote.$1.url" > /dev/null; then
git remote add "$1" "git@git.dn42:$1/registry.git"
fi
git fetch $1 2> /dev/null
git merge --no-ff --no-commit $1/$2 2> /dev/null
./check-pol HEAD $3 2> /dev/null || (echo "Policy Check FAILED"; clean_up; exit 1)
./check-my-stuff $3 2> /dev/null || (echo "Schema Check FAILED"; clean_up; exit 1)
git fetch "$1" 2> /dev/null
git merge --no-ff --no-commit "$1/$2" 2> /dev/null
./check-pol HEAD "$3" 2> /dev/null || (echo "Policy Check FAILED"; clean_up; exit 1)
./check-my-stuff "$3" 2> /dev/null || (echo "Schema Check FAILED"; clean_up; exit 1)
echo OK
clean_up