mirror of
https://github.com/ZwareBear/awx.git
synced 2026-05-05 07:51:51 -05:00
Improve RPM_DIST regular expression
This commit is contained in:
4
Makefile
4
Makefile
@@ -83,8 +83,8 @@ MOCK_BIN ?= mock
|
|||||||
MOCK_CFG ?=
|
MOCK_CFG ?=
|
||||||
|
|
||||||
# Offline TAR build parameters
|
# Offline TAR build parameters
|
||||||
DIST = $(shell echo $(RPM_DIST) | sed -e 's|^\..*\(el\)\([0-9]\)|\1|')
|
DIST = $(shell echo $(RPM_DIST) | sed -e 's|^\.\(el\)\([0-9]\).*|\1|')
|
||||||
DIST_MAJOR = $(shell echo $(RPM_DIST) | sed -e 's|^\..*\(el\)\([0-9]\)|\2|')
|
DIST_MAJOR = $(shell echo $(RPM_DIST) | sed -e 's|^\.\(el\)\([0-9]\).*|\2|')
|
||||||
DIST_FULL = $(DIST)$(DIST_MAJOR)
|
DIST_FULL = $(DIST)$(DIST_MAJOR)
|
||||||
OFFLINE_TAR_NAME = $(NAME)-offline-$(DIST_FULL)-$(VERSION)-$(RELEASE)
|
OFFLINE_TAR_NAME = $(NAME)-offline-$(DIST_FULL)-$(VERSION)-$(RELEASE)
|
||||||
OFFLINE_TAR_FILE = $(OFFLINE_TAR_NAME).tar.gz
|
OFFLINE_TAR_FILE = $(OFFLINE_TAR_NAME).tar.gz
|
||||||
|
|||||||
Reference in New Issue
Block a user