Skip to content

Commit

Permalink
Merge branch 'main' into renovate/major-20-node.js
Browse files Browse the repository at this point in the history
  • Loading branch information
emmercm authored Oct 27, 2023
2 parents 2717c3e + 24df53a commit d6bebdf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ cd "$(dirname -- "$0")/.." || exit 1
# Ensure node is available (same as asciinema-rec.sh)
if [ ! -x "$(command -v node)" ]; then
if [ ! -x "$(command -v nvm)" ] && [ -f ~/.nvm/nvm.sh ]; then
# shellcheck disable=SC1090
. ~/.nvm/nvm.sh
# shellcheck disable=SC1090,SC2240
. ~/.nvm/nvm.sh --install
fi
if [ ! -x "$(command -v nvm)" ]; then
nvm install || true
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@
},
"scripts": {
"cache:clear": "npm cache clean --force && node --experimental-vm-modules ./node_modules/jest/bin/jest.js --clearCache",
"//install": "npm install [--save|--save-dev] --lockfile-version 1 <package>",
"postinstall": "node --eval \"if(require('fs').existsSync('build')===false){process.exit(1);}\" || npm run build",
"prepare": "husky install",
"start": "ts-node index.ts",
"start": "node --loader ts-node/esm index.ts",
"build": "tsc && node --eval \"if(process.platform!=='win32'){process.exit(1);}\" || chmod +x build/index.js",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-readme-help.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cd "$(dirname "$0")/.."
README="README.md"
HELP="\$ igir --help
$(./node_modules/.bin/ts-node ./index.ts --help "${1:-97}" | sed 's/ *$//g')"
$(npm start -- --help "${1:-97}" | sed 's/ *$//g')"
(awk 'BEGIN {msg=ARGV[1]; delete ARGV[1]; p=1} /^```help/ {print; print msg; p=0} /^```$/ {p=1} p' \
"${HELP}" \
"${README}" > "${README}.temp" || exit 1) && mv -f "${README}.temp" "${README}"

0 comments on commit d6bebdf

Please sign in to comment.