Compare commits
7 Commits
master
...
zaneduffie
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
994b076174
|
||
|
|
7aedd40945
|
||
|
|
4bff72f4d2
|
||
|
|
5988b10d16
|
||
|
|
a75144bf94
|
||
|
|
35b6965e5d
|
||
|
|
489d6d1ee8
|
31
Makefile
31
Makefile
@@ -5,6 +5,18 @@ endif
|
|||||||
VERSION:=$(shell if [ -d .git ]; then bash -c '$(PREFIX)/bin/gitversion.sh | grep "^MAJOR=" | cut -d = -f 2'; else source version.sh && echo $$MAJOR ; fi)
|
VERSION:=$(shell if [ -d .git ]; then bash -c '$(PREFIX)/bin/gitversion.sh | grep "^MAJOR=" | cut -d = -f 2'; else source version.sh && echo $$MAJOR ; fi)
|
||||||
RELEASE:=$(shell if [ -d .git ]; then bash -c '$(PREFIX)/bin/gitversion.sh | grep "^BUILD=" | cut -d = -f 2'; else source version.sh && echo $$BUILD ; fi)
|
RELEASE:=$(shell if [ -d .git ]; then bash -c '$(PREFIX)/bin/gitversion.sh | grep "^BUILD=" | cut -d = -f 2'; else source version.sh && echo $$BUILD ; fi)
|
||||||
DISTFILE=./dist/cmdarg-$(VERSION)-$(RELEASE).tar.gz
|
DISTFILE=./dist/cmdarg-$(VERSION)-$(RELEASE).tar.gz
|
||||||
|
SPECFILE=cmdarg.spec
|
||||||
|
ifndef RHEL_VERSION
|
||||||
|
RHEL_VERSION=5
|
||||||
|
endif
|
||||||
|
ifeq ($(RHEL_VERSION),5)
|
||||||
|
MOCKFLAGS=--define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5"
|
||||||
|
endif
|
||||||
|
|
||||||
|
RHEL_RELEASE:=$(RELEASE).el$(RHEL_VERSION)
|
||||||
|
SRPM=cmdarg-$(VERSION)-$(RHEL_RELEASE).src.rpm
|
||||||
|
RPM=cmdarg-$(VERSION)-$(RHEL_RELEASE).noarch.rpm
|
||||||
|
RHEL_DISTFILE=./dist/cmdarg-$(VERSION)-$(RHEL_RELEASE).tar.gz
|
||||||
|
|
||||||
ifndef PREFIX
|
ifndef PREFIX
|
||||||
PREFIX=''
|
PREFIX=''
|
||||||
@@ -13,7 +25,7 @@ endif
|
|||||||
DISTFILE_DEPS=$(shell find . -type f | grep -Ev '\.git|\./dist/|$(DISTFILE)')
|
DISTFILE_DEPS=$(shell find . -type f | grep -Ev '\.git|\./dist/|$(DISTFILE)')
|
||||||
JUNIT_DEPS=$(wildcard *.sh) $(wildcard tests/*.sh)
|
JUNIT_DEPS=$(wildcard *.sh) $(wildcard tests/*.sh)
|
||||||
|
|
||||||
all: $(DISTFILE)
|
all: ./dist/$(RPM)
|
||||||
|
|
||||||
# --- PHONY targets
|
# --- PHONY targets
|
||||||
|
|
||||||
@@ -24,6 +36,10 @@ clean:
|
|||||||
|
|
||||||
dist: $(DISTFILE)
|
dist: $(DISTFILE)
|
||||||
|
|
||||||
|
srpm: ./dist/$(SRPM)
|
||||||
|
|
||||||
|
rpm: ./dist/$(RPM) ./dist/$(SRPM)
|
||||||
|
|
||||||
gitclean:
|
gitclean:
|
||||||
git clean -df
|
git clean -df
|
||||||
|
|
||||||
@@ -48,6 +64,19 @@ $(DISTFILE): version.sh
|
|||||||
rsync -aWH . --exclude=.git --exclude=dist ./dist/cmdarg-$(VERSION)-$(RELEASE)/
|
rsync -aWH . --exclude=.git --exclude=dist ./dist/cmdarg-$(VERSION)-$(RELEASE)/
|
||||||
cd dist && tar -czvf ../$@ cmdarg-$(VERSION)-$(RELEASE)
|
cd dist && tar -czvf ../$@ cmdarg-$(VERSION)-$(RELEASE)
|
||||||
|
|
||||||
|
$(RHEL_DISTFILE): $(DISTFILE)
|
||||||
|
cd dist && \
|
||||||
|
cp -R cmdarg-$(VERSION)-$(RELEASE) cmdarg-$(VERSION)-$(RHEL_RELEASE) && \
|
||||||
|
tar -czvf ../$@ cmdarg-$(VERSION)-$(RHEL_RELEASE)
|
||||||
|
|
||||||
|
./dist/$(SRPM): $(RHEL_DISTFILE)
|
||||||
|
rm -fr ./dist/$(SRPM)
|
||||||
|
mock -r epel-$(RHEL_VERSION)-noarch --buildsrpm --verbose --spec $(SPECFILE) $(MOCKFLAGS) --sources ./dist/ --resultdir ./dist/ --define "version $(VERSION)" --define "release $(RHEL_RELEASE)"
|
||||||
|
|
||||||
|
./dist/$(RPM): ./dist/$(SRPM)
|
||||||
|
rm -fr ./dist/$(RPM)
|
||||||
|
mock --verbose -r epel-$(RHEL_VERSION)-noarch ./dist/$(SRPM) --resultdir ./dist/ --define "version $(VERSION)" --define "release $(RHEL_RELEASE)"
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
rm -f $(PREFIX)/usr/lib/cmdarg.sh
|
rm -f $(PREFIX)/usr/lib/cmdarg.sh
|
||||||
|
|
||||||
|
|||||||
10
README.md
10
README.md
@@ -1,6 +1,8 @@
|
|||||||
cmdarg
|
cmdarg
|
||||||
======
|
======
|
||||||
|
|
||||||
|
[](http://jenkins.aklabs.net/job/cmdarg-test/)
|
||||||
|
|
||||||
Requires bash >= 4.
|
Requires bash >= 4.
|
||||||
|
|
||||||
source cmdarg.sh
|
source cmdarg.sh
|
||||||
@@ -12,7 +14,13 @@ Installation
|
|||||||
|
|
||||||
From source
|
From source
|
||||||
|
|
||||||
cp cmdarg.sh PATH_WHERE_YOU_WANT_IT
|
cd cmdarg
|
||||||
|
make install
|
||||||
|
|
||||||
|
From RPM
|
||||||
|
|
||||||
|
# add http://yum.aklabs.net/el/[5|6]/noarch as a yum repo for your system
|
||||||
|
yum install cmdarg
|
||||||
|
|
||||||
Usage
|
Usage
|
||||||
=====
|
=====
|
||||||
|
|||||||
@@ -412,11 +412,6 @@ function cmdarg_dump
|
|||||||
echo "${repr} => ${cmdarg_cfg[$key]}"
|
echo "${repr} => ${cmdarg_cfg[$key]}"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
echo "argv =>"
|
|
||||||
for idx in "${!cmdarg_argv[@]}"
|
|
||||||
do
|
|
||||||
echo " ${idx} => ${cmdarg_argv[$idx]}"
|
|
||||||
done
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmdarg_purge
|
function cmdarg_purge
|
||||||
|
|||||||
27
cmdarg.spec
Normal file
27
cmdarg.spec
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
%define __os_install_post %{nil}
|
||||||
|
Summary: Bash Command Line Argument Parsing Library
|
||||||
|
Name: cmdarg
|
||||||
|
Version: %{version}
|
||||||
|
Release: %{release}
|
||||||
|
License: MIT
|
||||||
|
Vendor: Andrew Kesterson
|
||||||
|
Packager: Andrew Kesterson <andrew@aklabs.net>
|
||||||
|
Group: Development Tools
|
||||||
|
Provides: %{name}
|
||||||
|
BuildArch: noarch
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
|
||||||
|
Source: %{name}-%{version}-%{release}.tar.gz
|
||||||
|
|
||||||
|
Requires: bash
|
||||||
|
|
||||||
|
%description
|
||||||
|
|
||||||
|
%install
|
||||||
|
mkdir -p %{buildroot}/usr/src
|
||||||
|
tar -zxvf %{_sourcedir}/%{name}-%{version}-%{release}.tar.gz
|
||||||
|
cd %{name}-%{version}-%{release}
|
||||||
|
PREFIX=%{buildroot} make install
|
||||||
|
PREFIX=%{buildroot} make MANIFEST
|
||||||
|
cp MANIFEST /tmp/
|
||||||
|
|
||||||
|
%files -f /tmp/MANIFEST
|
||||||
Reference in New Issue
Block a user