Skip to content

Commit ba436cd

Browse files
snisni
committed
use shipped npm
1 parent 7491a8b commit ba436cd

9 files changed

Lines changed: 7 additions & 23 deletions

File tree

‎distros/Makefile.CENTOS_7‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ BUILD_PACKAGES += ncurses-devel
3737
BUILD_PACKAGES += net-snmp
3838
BUILD_PACKAGES += net-snmp-devel
3939
BUILD_PACKAGES += net-snmp-utils
40-
BUILD_PACKAGES += npm # thruk theme
4140
BUILD_PACKAGES += openssl-devel
4241
BUILD_PACKAGES += pam-devel
4342
BUILD_PACKAGES += pango-devel

‎distros/Makefile.CENTOS_8‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ BUILD_PACKAGES += ncurses-devel
4141
BUILD_PACKAGES += net-snmp
4242
BUILD_PACKAGES += net-snmp-devel
4343
BUILD_PACKAGES += net-snmp-utils
44-
BUILD_PACKAGES += npm # thruk theme
4544
BUILD_PACKAGES += openssl-devel
4645
BUILD_PACKAGES += pam-devel
4746
BUILD_PACKAGES += pango-devel

‎distros/Makefile.DEBIAN_10‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ BUILD_PACKAGES += libsqlite3-dev # gearmand
4444
BUILD_PACKAGES += libssl-dev
4545
BUILD_PACKAGES += libsystemd-dev # grafana-loki
4646
BUILD_PACKAGES += libxml2-dev
47-
BUILD_PACKAGES += npm # thruk theme
4847
BUILD_PACKAGES += patch
4948
BUILD_PACKAGES += python3-dev
5049
BUILD_PACKAGES += python3-setuptools
@@ -99,6 +98,7 @@ OS_PACKAGES += libsqlite3-0
9998
OS_PACKAGES += libuuid1
10099
OS_PACKAGES += libxcomposite1 # chrome
101100
OS_PACKAGES += libxdamage1 # chrome
101+
OS_PACKAGES += libxfixes3 # npm
102102
OS_PACKAGES += libxkbcommon0 # chrome
103103
OS_PACKAGES += libxrandr2 # chrome
104104
OS_PACKAGES += mariadb-server|mysql-server|virtual-mysql-server

‎distros/Makefile.DEBIAN_11‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ BUILD_PACKAGES += libsqlite3-dev # gearmand
4444
BUILD_PACKAGES += libssl-dev
4545
BUILD_PACKAGES += libsystemd-dev # grafana-loki
4646
BUILD_PACKAGES += libxml2-dev
47-
BUILD_PACKAGES += npm # thruk theme
4847
BUILD_PACKAGES += patch
4948
BUILD_PACKAGES += python2-dev
5049
BUILD_PACKAGES += python3-dev
@@ -101,6 +100,7 @@ OS_PACKAGES += libsqlite3-0
101100
OS_PACKAGES += libuuid1
102101
OS_PACKAGES += libxcomposite1 # chrome
103102
OS_PACKAGES += libxdamage1 # chrome
103+
OS_PACKAGES += libxfixes3 # npm
104104
OS_PACKAGES += libxkbcommon0 # chrome
105105
OS_PACKAGES += libxrandr2 # chrome
106106
OS_PACKAGES += mariadb-server|mysql-server|virtual-mysql-server

‎distros/Makefile.OPENSUSE_15.4‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ BUILD_PACKAGES += make
5050
BUILD_PACKAGES += mysql
5151
BUILD_PACKAGES += net-snmp
5252
BUILD_PACKAGES += net-snmp-devel
53-
BUILD_PACKAGES += npm # thruk theme
5453
BUILD_PACKAGES += openldap2-devel
5554
BUILD_PACKAGES += pango-devel
5655
BUILD_PACKAGES += patch

‎distros/Makefile.ROCKY_9‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ BUILD_PACKAGES += ncurses-devel
4141
BUILD_PACKAGES += net-snmp
4242
BUILD_PACKAGES += net-snmp-devel
4343
BUILD_PACKAGES += net-snmp-utils
44-
BUILD_PACKAGES += npm # thruk theme
4544
BUILD_PACKAGES += openssl-devel
4645
BUILD_PACKAGES += pam-devel
4746
BUILD_PACKAGES += pango-devel

‎distros/Makefile.UBUNTU_20.04‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ BUILD_PACKAGES += libsqlite3-dev # gearmand
4444
BUILD_PACKAGES += libssl-dev
4545
BUILD_PACKAGES += libsystemd-dev # grafana-loki
4646
BUILD_PACKAGES += libxml2-dev
47-
BUILD_PACKAGES += npm # thruk theme
4847
BUILD_PACKAGES += patch
4948
BUILD_PACKAGES += python3-dev
5049
BUILD_PACKAGES += python3-setuptools
@@ -101,6 +100,7 @@ OS_PACKAGES += libsqlite3-0
101100
OS_PACKAGES += libuuid1
102101
OS_PACKAGES += libxcomposite1 # chrome
103102
OS_PACKAGES += libxdamage1 # chrome
103+
OS_PACKAGES += libxfixes3 # npm
104104
OS_PACKAGES += libxkbcommon0 # chrome
105105
OS_PACKAGES += libxml2
106106
OS_PACKAGES += libxrandr2 # chrome

‎distros/Makefile.UBUNTU_22.04‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ BUILD_PACKAGES += libsqlite3-dev # gearmand
4444
BUILD_PACKAGES += libssl-dev
4545
BUILD_PACKAGES += libsystemd-dev # grafana-loki
4646
BUILD_PACKAGES += libxml2-dev
47-
BUILD_PACKAGES += npm # thruk theme
4847
BUILD_PACKAGES += patch
4948
BUILD_PACKAGES += python3-dev
5049
BUILD_PACKAGES += python3-setuptools
@@ -99,6 +98,7 @@ OS_PACKAGES += libsqlite3-0
9998
OS_PACKAGES += libuuid1
10099
OS_PACKAGES += libxcomposite1 # chrome
101100
OS_PACKAGES += libxdamage1 # chrome
101+
OS_PACKAGES += libxfixes3 # npm
102102
OS_PACKAGES += libxkbcommon0 # chrome
103103
OS_PACKAGES += libxml2
104104
OS_PACKAGES += libxrandr2 # chrome

‎packages/thruk-consol-theme/consol-theme/Makefile‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ SHELL=/bin/bash
22
NAME=Consol
33
N_PREFIX=$(shell pwd)/node_modules
44
NODEVERSION=16
5+
export PATH := $(shell ls -d1 ../../node/node-*/bin):$(PATH)
56

67
.PHONY: Thruk
78

@@ -11,50 +12,37 @@ stylesheets/$(NAME).css: Thruk node_modules src/$(NAME).css
1112
mkdir -p stylesheets
1213
NODE_ENV=production \
1314
N_PREFIX=$(N_PREFIX) \
14-
./node_modules/.bin/n exec $(NODEVERSION) \
1515
npx tailwindcss -o stylesheets/${NAME}.css --input ./src/${NAME}.css --postcss ./postcss.config.js --minify
1616
touch stylesheets/${NAME}.css
1717

1818
dev: Thruk node_modules
1919
mkdir -p stylesheets
2020
NODE_ENV=dev \
2121
N_PREFIX=$(N_PREFIX) \
22-
./node_modules/.bin/n exec $(NODEVERSION) \
2322
npx tailwindcss -o stylesheets/${NAME}.css --input ./src/${NAME}.css --postcss ./postcss.config.js
2423

2524
watch: Thruk node_modules
2625
mkdir -p stylesheets
2726
NODE_ENV=dev \
2827
N_PREFIX=$(N_PREFIX) \
29-
./node_modules/.bin/n exec $(NODEVERSION) \
3028
npx tailwindcss -o stylesheets/${NAME}.css --input ./src/${NAME}.css --postcss ./postcss.config.js --watch
3129

3230
Thruk:
3331
test -e Thruk || git clone https://github.com/sni/Thruk.git
3432
test -h Thruk || ( cd Thruk && git pull )
3533
ln -fns $$(realpath Thruk/themes/base.css) base.css
3634

37-
node: node_modules/.bin/n
38-
39-
node_modules/.bin/n:
40-
npm install n
41-
N_PREFIX=$(N_PREFIX) \
42-
./node_modules/.bin/n $(NODEVERSION)
43-
44-
node_modules: node
35+
node_modules:
4536
N_PREFIX=$(N_PREFIX) \
46-
./node_modules/.bin/n exec $(NODEVERSION) npm i -D \
37+
npm i -D \
4738
tailwindcss@latest \
4839
postcss@latest \
4940
autoprefixer@latest \
5041
postcss-import@latest \
5142
@tailwindcss/forms@latest \
52-
# sometimes .bin dissapears after installing modules
53-
test -e ./node_modules/.bin/n || $(MAKE) node
5443

5544
clean:
5645
rm -rf \
57-
node \
5846
node_modules \
5947
package.json \
6048
package-lock.json \

0 commit comments

Comments
 (0)