From e2c9339ec411f9a58fdeb054bf1bba51ecc623fc Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Wed, 19 May 2021 20:58:29 +0200
Subject: [PATCH 1/2] fix husky setup in prod environment

---
 CHANGELOG.md | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b2690b7..89f7c9b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,7 +29,7 @@ Special thanks to the following contributors: @B1gG, @codac, @ezeholz, @khassel,
 - Use node v16 in github workflow (replacing node v10)
 - Moved some files into better suited directories
 - Update dependencies in package.json, require node >= v12, remove `rrule-alt` and `rrule`
-- Update dependencies in package.json and migrate husky to v6
+- Update dependencies in package.json and migrate husky to v6, fix husky setup in prod environment
 
 ### Removed
 
diff --git a/package.json b/package.json
index 4b45193d..35816029 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
 		"lint:prettier": "prettier --write **/*.{js,css,json,md,yml}",
 		"lint:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --fix",
 		"lint:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json --fix",
-		"prepare": "husky install"
+		"prepare": "[ -f node_modules/.bin/husky ] && husky install || echo no husky installed."
 	},
 	"repository": {
 		"type": "git",

From 57fe94f9457d0eb2ec95c3a580086ca76f3a014b Mon Sep 17 00:00:00 2001
From: veeck <veeck@neofonie.de>
Date: Wed, 26 May 2021 11:39:29 +0200
Subject: [PATCH 2/2] Fix call to pretty quick, make husky script executable

---
 .husky/pre-commit | 2 +-
 package.json      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 .husky/pre-commit

diff --git a/.husky/pre-commit b/.husky/pre-commit
old mode 100644
new mode 100755
index 9ad483a5..3199e8e0
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-pretty-quick --staged
+npm run lint:staged
diff --git a/package.json b/package.json
index 35816029..d965385a 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
 		"lint:prettier": "prettier --write **/*.{js,css,json,md,yml}",
 		"lint:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --fix",
 		"lint:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json --fix",
+		"lint:staged": "pretty-quick --staged",
 		"prepare": "[ -f node_modules/.bin/husky ] && husky install || echo no husky installed."
 	},
 	"repository": {