Skip to content

Commit 118a96f

Browse files
committed
Revert "Merge branch 'clock-week' of https://github.com/bughaver/MagicMirror into clock-week"
This reverts commit ecc6e59, reversing changes made to 3c88639.
1 parent ecc6e59 commit 118a96f

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

.husky/pre-commit

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
1-
#!/usr/bin/env bash
1+
#!/bin/sh
22

3-
# Get the path to the project root
4-
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
5-
PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
6-
7-
# Add node_modules/.bin to PATH
8-
PATH="$PROJECT_ROOT/node_modules/.bin:$PATH"
9-
10-
# Source NVM if available
11-
export NVM_DIR="$HOME/.nvm"
12-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
13-
14-
# Run lint-staged
15-
if [ -f "$PROJECT_ROOT/node_modules/.bin/lint-staged" ]; then
16-
"$PROJECT_ROOT/node_modules/.bin/lint-staged"
17-
else
18-
npx lint-staged
3+
if command -v npx &> /dev/null; then
4+
npx lint-staged
195
fi

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"lint:markdown": "markdownlint-cli2 . --fix",
3535
"lint:prettier": "prettier . --write",
3636
"postinstall": "node --run install-vendor && node --run install-fonts && echo \"MagicMirror² installation finished successfully! \n\"",
37-
"prepare": "husky install",
37+
"prepare": "[ -f node_modules/.bin/husky ] && husky || echo no husky installed.",
3838
"server": "node ./serveronly",
3939
"start": "node --run start:x11",
4040
"start:dev": "node --run start:x11 -- dev",

0 commit comments

Comments
 (0)