[pve-devel] [PATCH eslint/manager/wt/pmg-gui/proxmox-backup] change eslint

[pve-devel] [PATCH eslint/manager/wt/pmg-gui/proxmox-backup] change eslint

[Dominik Csapak]

from 'eslint' to 'pve-eslint' to avoid a conflict with debians 'eslint'
package which ships the same binary

we have to bump the package and update the dev-dependency in the other
repositories

maybe we can/should also apply this on stable-7/2? so that on an
upgrade to 8.x/3.x it does not run into issues?

pve-eslint:

Dominik Csapak (1):
  change binary name from 'eslint' to 'pve-eslint'

 debian/links | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

pve-manager:

Dominik Csapak (1):
  use 'pve-eslint' instead of 'eslint'

 www/manager6/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

proxmox-widget-toolkit:

Dominik Csapak (1):
  use 'pve-eslint' instead of 'eslint'

 src/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

pmg-gui:

Dominik Csapak (1):
  use 'pve-eslint' instead of 'eslint'

 js/Makefile        | 4 ++--
 js/mobile/Makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

proxmox-backup:

Dominik Csapak (1):
  use 'pve-eslint' instead of 'eslint'

 www/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.30.2

[pve-devel] [PATCH eslint 1/1] change binary name from 'eslint' to 'pve-eslint'

[Dominik Csapak]

so that we don't conflict with 'eslint' package in debian, which ships
the same binary

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 debian/links | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/links b/debian/links
index 99342ed..0a1546f 100644
--- a/debian/links
+++ b/debian/links
@@ -1 +1 @@
-usr/share/nodejs/pve-eslint/bin/app.js usr/bin/eslint
+usr/share/nodejs/pve-eslint/bin/app.js usr/bin/pve-eslint
-- 
2.30.2

[pve-devel] [PATCH manager 1/1] use 'pve-eslint' instead of 'eslint'

[Dominik Csapak]

since we changed the binary name

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 2d884f4a..d19167c2 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -314,13 +314,13 @@ WIDGETKIT=/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
 all:
 
 .lint-incremental: $(JSSRC)
-	eslint $?
+	pve-eslint $?
 	touch "$@"
 
 .PHONY: lint
 check: lint
 lint: $(JSSRC)
-	eslint --strict $(JSSRC)
+	pve-eslint --strict $(JSSRC)
 	touch ".lint-incremental"
 
 pvemanagerlib.js: .lint-incremental OnlineHelpInfo.js $(JSSRC)
-- 
2.30.2

[pve-devel] [PATCH widget-toolkit 1/1] use 'pve-eslint' instead of 'eslint'

[Dominik Csapak]

since we changed the binary name

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 7cff5dd..d312308 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -110,14 +110,14 @@ all: $(SUBDIRS)
 	set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i; done
 
 .lint-incremental: $(JSSRC)
-	eslint $?
+	pve-eslint $?
 	touch "$@"
 
 .PHONY: lint
 check: lint
-	eslint --strict api-viewer/APIViewer.js
+	pve-eslint --strict api-viewer/APIViewer.js
 lint: $(JSSRC)
-	eslint --strict $(JSSRC)
+	pve-eslint --strict $(JSSRC)
 	touch ".lint-incremental"
 
 BUILD_TIME=$(or $(SOURCE_DATE_EPOCH),$(shell date '+%s.%N'))
-- 
2.30.2

[pve-devel] [PATCH pmg-gui 1/1] use 'pve-eslint' instead of 'eslint'

[Dominik Csapak]

since we changed the binary name

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 js/Makefile        | 4 ++--
 js/mobile/Makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/Makefile b/js/Makefile
index fad2bd6..d0f02ff 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -106,7 +106,7 @@ OnlineHelpInfo.js: /usr/bin/asciidoc-pmg
 	mv $@.tmp $@
 
 .lint-incremental: ${JSSRC}
-	eslint $?
+	pve-eslint $?
 	touch "$@"
 
 .PHONY: lint
@@ -114,7 +114,7 @@ lint: .lint-incremental
 
 .PHONY: check
 check: ${JSSRC}
-	eslint --strict ${JSSRC}
+	pve-eslint --strict ${JSSRC}
 	touch ".lint-incremental"
 
 pmgmanagerlib.js: OnlineHelpInfo.js ${JSSRC}
diff --git a/js/mobile/Makefile b/js/mobile/Makefile
index 3e379d2..e63f179 100644
--- a/js/mobile/Makefile
+++ b/js/mobile/Makefile
@@ -10,7 +10,7 @@ MOBILESRC=				\
 	  app.js			\
 
 lint: pmgmanagerlib-mobile.js
-	eslint $^
+	pve-eslint $^
 
 .PHONY: check
 check: lint
-- 
2.30.2

[pve-devel] [PATCH proxmox-backup 1/1] use 'pve-eslint' instead of 'eslint'

[Dominik Csapak]

since we changed the binary name

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/Makefile b/www/Makefile
index 476c80b6..bc1fd6f2 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -133,11 +133,11 @@ js/proxmox-backup-gui.js: .lint-incremental js OnlineHelpInfo.js ${JSSRC}
 
 .PHONY: check
 check:
-	eslint --strict ${JSSRC}
+	pve-eslint --strict ${JSSRC}
 	touch ".lint-incremental"
 
 .lint-incremental: ${JSSRC}
-	eslint $?
+	pve-eslint $?
 	touch "$@"
 
 .PHONY: clean
-- 
2.30.2