From 6e98d349e8ae3aca9b01888b11200120c724b7b2 Mon Sep 17 00:00:00 2001 From: bel Date: Thu, 27 Apr 2023 21:45:08 -0600 Subject: [PATCH] fixing build.sh for new age and nvm --- json-resume/build.sh | 23 ++++-- json-resume/package-lock.json | 133 +++++++++++++++++++++++----------- json-resume/package.json | 2 +- 3 files changed, 106 insertions(+), 52 deletions(-) diff --git a/json-resume/build.sh b/json-resume/build.sh index 9a8f437..87b0816 100755 --- a/json-resume/build.sh +++ b/json-resume/build.sh @@ -24,11 +24,14 @@ install() { if ! which wkhtmltopdf &> /dev/null; then log installing wkhtmltopdf - false - sudo apt -y install xfonts-75dpi - wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb - sudo dpkg -i wkhtmltox_0.12.6-1.focal_amd64.deb - rm ./wkhtml*.deb + local d=$(mktemp -d) + apt -y install xfonts-75dpi + wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb -O "$d/wkhtmltox.deb" + if ! dpkg -i "$d/wkhtmltox.deb"; then + apt-get -f install + dpkg -i "$d/wkhtmltox.deb" + fi + rm -rf "$d" fi } @@ -37,7 +40,7 @@ install_cli() { return fi - sudo npm install -g resume-cli + _npm install -g resume-cli which resume } @@ -47,7 +50,7 @@ install_themes() { return fi log installing theme $theme - if ! npm install jsonresume-theme-$theme; then + if ! _npm install jsonresume-theme-$theme; then log failed export THEMES="${THEMES//,$theme,/,}" else @@ -79,6 +82,12 @@ build_theme() { ) || true } +_npm() { + which npm || exit 1 + echo "> $(which npm) "$@"" >&2 + $(which npm) "$@" +} + log() { echo "$(date) > $*" >&2 diff --git a/json-resume/package-lock.json b/json-resume/package-lock.json index dd5b9d8..3944c2f 100755 --- a/json-resume/package-lock.json +++ b/json-resume/package-lock.json @@ -1,113 +1,147 @@ { + "name": "json-resume", + "lockfileVersion": 3, "requires": true, - "lockfileVersion": 1, - "dependencies": { - "amdefine": { + "packages": { + "": { + "dependencies": { + "jsonresume-theme-flat": "^0.3.7", + "jsonresume-theme-onepage": "^0.0.3", + "jsonresume-theme-short": "^0.1.7" + } + }, + "node_modules/amdefine": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==", - "optional": true + "optional": true, + "engines": { + "node": ">=0.4.2" + } }, - "async": { + "node_modules/async": { "version": "0.2.10", "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==", "optional": true }, - "atob": { + "node_modules/atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", + "bin": { + "atob": "bin/atob.js" + }, + "engines": { + "node": ">= 4.5.0" + } }, - "css": { + "node_modules/css": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz", "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", - "requires": { + "dependencies": { "inherits": "^2.0.3", "source-map": "^0.6.1", "source-map-resolve": "^0.5.2", "urix": "^0.1.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } } }, - "decode-uri-component": { + "node_modules/css/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==" + "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==", + "engines": { + "node": ">=0.10" + } }, - "handlebars": { + "node_modules/handlebars": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz", "integrity": "sha512-OdfkaA0M8qGD5EJBkMw3TpguSWl6lz94jdyVmYs5e4TpwepZJ35Y5XlchsIwcN7NP/yzNa3MJYd/dRTO7Nf/fg==", - "requires": { - "optimist": "~0.3", + "dependencies": { + "optimist": "~0.3" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { "uglify-js": "~2.3" } }, - "inherits": { + "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "jsonresume-theme-flat": { + "node_modules/jsonresume-theme-flat": { "version": "0.3.7", "resolved": "https://registry.npmjs.org/jsonresume-theme-flat/-/jsonresume-theme-flat-0.3.7.tgz", "integrity": "sha512-sdDkJdmMR4hqV/z/acBQCEWmzUlmsg74F97+aeH7KMhRRipB7j8GO2XKZxK9Zb+lh3ewZ7kmlo5/AX+mvTYcig==", - "requires": { + "dependencies": { "handlebars": "^2.0.0-alpha.4" } }, - "jsonresume-theme-onepage": { + "node_modules/jsonresume-theme-onepage": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/jsonresume-theme-onepage/-/jsonresume-theme-onepage-0.0.3.tgz", "integrity": "sha512-hfiSUbHHoWJkRxcYe5/bSZxZRmg3DAIBFgxnGOZXFzuytqxpzb9sTfI5fQ+0FNAxfsAcYVOFw0tMpzD6QNO53Q==", - "requires": { + "dependencies": { "css": "2.2.x", "handlebars": "^2.0.0-alpha.4" } }, - "jsonresume-theme-short": { + "node_modules/jsonresume-theme-short": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/jsonresume-theme-short/-/jsonresume-theme-short-0.1.7.tgz", "integrity": "sha512-ZEuXWAAh9T0nPrCjJLlGUL8QbCYJAEfF3XheQ2elMGolDZpSz1nY5TPJxoMSyIBurKNs9gdQFh+cD42wySH5gg==", - "requires": { + "dependencies": { "handlebars": "^2.0.0-alpha.4" } }, - "optimist": { + "node_modules/optimist": { "version": "0.3.7", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", "integrity": "sha512-TCx0dXQzVtSCg2OgY/bO9hjM9cV4XYx09TVK+s3+FhkjT6LovsLe+pPMzpWf+6yXK/hUizs2gUoTw3jHM0VaTQ==", - "requires": { + "dependencies": { "wordwrap": "~0.0.2" } }, - "resolve-url": { + "node_modules/resolve-url": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==" + "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==", + "deprecated": "https://github.com/lydell/resolve-url#deprecated" }, - "source-map": { + "node_modules/source-map": { "version": "0.1.43", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==", "optional": true, - "requires": { + "dependencies": { "amdefine": ">=0.0.4" + }, + "engines": { + "node": ">=0.8.0" } }, - "source-map-resolve": { + "node_modules/source-map-resolve": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", - "requires": { + "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", + "dependencies": { "atob": "^2.1.2", "decode-uri-component": "^0.2.0", "resolve-url": "^0.2.1", @@ -115,31 +149,42 @@ "urix": "^0.1.0" } }, - "source-map-url": { + "node_modules/source-map-url": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", - "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==" + "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", + "deprecated": "See https://github.com/lydell/source-map-url#deprecated" }, - "uglify-js": { + "node_modules/uglify-js": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz", "integrity": "sha512-T2LWWydxf5+Btpb0S/Gg/yKFmYjnX9jtQ4mdN9YRq73BhN21EhU0Dvw3wYDLqd3TooGUJlCKf3Gfyjjy/RTcWA==", "optional": true, - "requires": { + "dependencies": { "async": "~0.2.6", "optimist": "~0.3.5", "source-map": "~0.1.7" + }, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.4.0" } }, - "urix": { + "node_modules/urix": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==" + "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==", + "deprecated": "Please see https://github.com/lydell/urix#deprecated" }, - "wordwrap": { + "node_modules/wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==" + "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==", + "engines": { + "node": ">=0.4.0" + } } } } diff --git a/json-resume/package.json b/json-resume/package.json index 6785ed9..38a1ac1 100644 --- a/json-resume/package.json +++ b/json-resume/package.json @@ -1,7 +1,7 @@ { "dependencies": { "jsonresume-theme-flat": "^0.3.7", - "jsonresume-theme-onepage": "0.0.3", + "jsonresume-theme-onepage": "^0.0.3", "jsonresume-theme-short": "^0.1.7" } }