Merge branch 'branches/rudder/8.1'

Normation · Jan 19, 2024 · ef0878b · ef0878b
2 parents 0ebe7cf + 3fb1348
commit ef0878b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/makefiles/global-vars.mk b/makefiles/global-vars.mk
@@ -4,6 +4,7 @@
 
 MAIN_BUILD      = $(shell  [ -f main-build.conf ] && echo '.' || echo '..')/main-build.conf
 RUDDER_VERSION  = $(shell sed -ne '/^rudder-version=/s/rudder-version=//p' $(MAIN_BUILD))
+MINOR_VERSION   = $(shell echo "$(RUDDER_VERSION)" | grep -Po '^\d+.\d+')
 BRANCH_TYPE     = $(shell sed -ne '/^branch-type=/s/branch-type=//p' $(MAIN_BUILD))
 COMMON_VERSION  = $(shell sed -ne '/^common-version=/s/common-version=//p' $(MAIN_BUILD))
 PRIVATE_VERSION = $(shell sed -ne '/^private-version=/s/private-version=//p' $(MAIN_BUILD))

diff --git a/openscap/Makefile b/openscap/Makefile
@@ -12,7 +12,7 @@ SCRIPTS = postinst
 include ../makefiles/common-scala-plugin.mk
 
 target/rudderc:
-	wget https://repository.rudder.io/tools/rudderc/8.0/rudderc-linux-x86_64 -O target/rudderc
+	wget https://repository.rudder.io/tools/rudderc/${MINOR_VERSION}/rudderc-linux-x86_64 -O target/rudderc
 	chmod +x target/rudderc
 
 target/openscap_technique.zip: target/rudderc