External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 21:49:27 -02:30
Code Issues Packages Projects Releases Wiki Activity

Improve RPM_DIST regular expression

Browse Source
This commit is contained in:
James Laska
2015-08-31 13:16:59 -04:00
parent 797aa9b5d8
commit 2b5624daa2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -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