Add support for directory filespecs in katello-certs-gen-rpm

Katello · Jun 13, 2018 · 38c2e0e · 38c2e0e
1 parent 10fdc54
commit 38c2e0e
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/katello-certs-gen-rpm b/katello-certs-gen-rpm
@@ -249,7 +249,12 @@ while [ $i -lt ${#PARAMS[*]} ]; do
         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}
+            if [ -d "$src" ] ; then
+                mkdir --parents --verbose ${RPM_BUILD_DIR}/${DIRNAME}/${dst}
+            else
+                mkdir --parents --verbose ${RPM_BUILD_DIR}/${DIRNAME}/`dirname "${dst}"`
+                cp ${src} ${RPM_BUILD_DIR}/${DIRNAME}/${dst}
+            fi
         )
     )
     i=$[$i+1]
@@ -278,7 +283,11 @@ 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
             )
         )
     )