Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for directory and wildcard filespecs in katello-certs-gen-rpm #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+22 −22
Open

Add support for directory and wildcard filespecs in katello-certs-gen-rpm #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8e7dea
Add support for directory filespecs in katello-certs-gen-rpm
PaulSD Jun 13, 2018
0931c2f
Add support for wildcard filespecs in katello-certs-gen-rpm
PaulSD Jun 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions katello-certs-gen-rpm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,35 +240,29 @@ TARBALL=$NAME-$VERSION.tar.gz
echo "Building $NAME-$VERSION-$RELEASE.$ARCH.rpm"

rm -rf $RPM_BUILD_DIR
install --verbose -d $RPM_BUILD_DIR/$DIRNAME
install --verbose -d $RPM_BUILD_DIR/$DIRNAME/root

# Prepare the tar file
i=0
while [ $i -lt ${#PARAMS[*]} ]; do
echo ${PARAMS[$i]} | (
IFS== read dstmod src
echo ${dstmod} | (IFS=: read dst mod
echo "${src} -> ${RPM_BUILD_DIR}/${DIRNAME}/${dst}"
mkdir --parents --verbose ${RPM_BUILD_DIR}/${DIRNAME}/`dirname "${dst}"`; cp ${src} ${RPM_BUILD_DIR}/${DIRNAME}/${dst}
echo "${src} -> ${RPM_BUILD_DIR}/${DIRNAME}/root/${dst}"
if [ -d "$src" ] ; then
mkdir --parents --verbose ${RPM_BUILD_DIR}/${DIRNAME}/root/${dst}
else
dstdir=`dirname "${dst}"`
mkdir --parents --verbose ${RPM_BUILD_DIR}/${DIRNAME}/root/${dstdir}
cp ${src} ${RPM_BUILD_DIR}/${DIRNAME}/root/${dstdir}
fi
)
)
i=$[$i+1]
done

# Build the install section
installsect=`i=0
while [ $i -lt ${#PARAMS[*]} ]; do
echo ${PARAMS[$i]} | (
IFS== read dstmod src
echo ${dstmod} | (IFS=: read dst mod
echo "install --verbose -d \\\$RPM_BUILD_ROOT\`dirname ${dst}\`"
echo "install --verbose .${dst} \\\$RPM_BUILD_ROOT${dst}")
)
i=$[$i+1]
done | sort | uniq | while read line; do echo -n "$line\n"; done`

# Build the file section
filesect=`i=0
# Build the files section
filessect=`i=0
while [ $i -lt ${#PARAMS[*]} ]; do
echo ${PARAMS[$i]} | (
IFS== read dstmod src
Expand All @@ -278,12 +272,18 @@ while [ $i -lt ${#PARAMS[*]} ]; do
# NOTE there's already a %defattr(-,root,root), so if there's no u
# or g defined, set it to '-' by default
echo $mod | (IFS=, read m u g
echo "%attr(${m:-0644},${u:--},${g:--}) ${dst}"
if [ -d "$src" ] ; then
echo "%dir %attr(${m:-0755},${u:--},${g:--}) ${dst}"
else
echo "%attr(${m:-0644},${u:--},${g:--}) ${dst}"
fi
)
)
)
i=$[$i+1]
done | sort | uniq | while read line; do echo -n "$line\n"; done`
# "sort -k 1.2,1.2r" sorts lines that start with %dir above lines that start
# with %attr, then sorts normally within those two groups of lines
done | sort -k 1.2,1.2r | uniq | while read line; do echo -n "$line\n"; done`

cat > $RPM_BUILD_DIR/$DIRNAME/$NAME.spec << EOF
Name: $NAME
Expand Down Expand Up @@ -314,8 +314,8 @@ Vendor: $VENDOR

%install
rm -rf \$RPM_BUILD_ROOT
install -d \$RPM_BUILD_ROOT
`echo -e $installsect`
install -d \`dirname \$RPM_BUILD_ROOT\`
cp --verbose -R root \$RPM_BUILD_ROOT

%clean
rm -rf \$RPM_BUILD_ROOT
Expand All @@ -326,7 +326,7 @@ rm -rf \$RPM_BUILD_ROOT
`generate_section "$PREUN" preun`

%files
`echo -e $filesect`
`echo -e $filessect`
EOF

# Build the tarball
Expand Down