Merge pull request #93 from essentialkaos/develop

Version 2.9.0

SOURCES/libexec/sources-scm.shx

@@ -675,22 +675,3 @@ packSourcesFromSvn() {
 
   show "Source files from ${CL_BOLD}svn${CL_NORM} repo packed as ${CL_CYAN}${source_name}.${source_ext}${CL_NORM} ${CL_DARK}(${source_size})${CL_NORM}"
 }
-
-# Remove SCM data from directory with data
-#
-# 1: Path to dir with sources (String)
-#
-# Code: No
-# Echo: No
-cleanPackDir() {
-  local dir="$1"
-
-  find "$dir" -type d -name ".git" -exec rm -rf {} \; 2> /dev/null
-  find "$dir" -type d -name ".hg" -exec rm -rf {} \; 2> /dev/null
-  find "$dir" -type d -name ".svn" -exec rm -rf {} \; 2> /dev/null
-  find "$dir" -type d -name ".bzr" -exec rm -rf {} \; 2> /dev/null
-
-  find "$dir" -type f -name ".gitignore" -exec rm -f {} \; 2> /dev/null
-  find "$dir" -type f -name ".hgignore" -exec rm -f {} \; 2> /dev/null
-  find "$dir" -type f -name ".bzrignore" -exec rm -f {} \; 2> /dev/null
-}

SOURCES/libexec/sources.shx

@@ -267,3 +267,38 @@ generateChecksumFile() {
 
   return $status
 }
+
+# Remove useless files and directories from directory with data
+#
+# 1: Path to directory with sources (String)
+#
+# Code: No
+# Echo: No
+cleanPackDir() {
+  local dir="$1"
+
+  find "$dir" -type d -name ".git" -exec rm -rf {} \; 2> /dev/null
+  find "$dir" -type d -name ".hg" -exec rm -rf {} \; 2> /dev/null
+  find "$dir" -type d -name ".svn" -exec rm -rf {} \; 2> /dev/null
+  find "$dir" -type d -name ".bzr" -exec rm -rf {} \; 2> /dev/null
+
+  find "$dir" -type f -name ".gitignore" -exec rm -f {} \; 2> /dev/null
+  find "$dir" -type f -name ".hgignore" -exec rm -f {} \; 2> /dev/null
+  find "$dir" -type f -name ".bzrignore" -exec rm -f {} \; 2> /dev/null
+  find "$dir" -type f -name ".gitmodules" -exec rm -f {} \; 2>/dev/null
+
+  # Remove CI service configuration files
+  find "$dir" -type f -name ".github" -exec rm -rf {} \; 2>/dev/null
+  find "$dir" -type f -name ".travis.yml" -exec rm -f {} \; 2>/dev/null
+  find "$dir" -type f -name ".drone.sec" -exec rm -f {} \; 2>/dev/null
+  find "$dir" -type f -name ".drone.yml" -exec rm -f {} \; 2>/dev/null
+  find "$dir" -type f -name ".hound.yml" -exec rm -f {} \; 2>/dev/null
+  find "$dir" -type f -name ".vexor.yml" -exec rm -f {} \; 2>/dev/null
+  find "$dir" -type f -name ".codebeatsettings" -exec rm -f {} \; 2>/dev/null
+
+  # Remove test data
+  find "$dir" -type d -name "testdata" -exec rm -rf {} \; 2>/dev/null
+
+  # Remove empty directories
+  find "$dir" -type d -empty -delete 2>/dev/null
+}

SOURCES/rpmbuilder

@@ -13,7 +13,7 @@ fi
 APP="RPMBuilder"
 
 # Utility version (String)
-VER="2.8.1"
+VER="2.9.0"
 
 ################################################################################
 

rpmbuilder.source

@@ -2,4 +2,3 @@ SOURCES/rpmbuilder
 SOURCES/rpmunbuilder
 SOURCES/libexec/
 LICENSE
-SOURCES/LICENSE

rpmbuilder.spec

@@ -2,7 +2,7 @@
 
 Summary:         RPM package build helper
 Name:            rpmbuilder
-Version:         2.8.0
+Version:         2.9.0
 Release:         0%{?dist}
 License:         Apache License, Version 2.0
 Group:           Development/Tools
@@ -15,7 +15,7 @@ BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:        rpm >= 4.8.0 rpm-build rpmdevtools yum-utils
 Requires:        sshpass coreutils tmux
-Requires:        perfecto >= 2.0 rpmlint
+Requires:        perfecto >= 3.0 rpmlint
 
 Provides:        %{name} = %{version}-%{release}
 
@@ -47,14 +47,17 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE LICENSE.RU
+%doc LICENSE
 %{_libexecdir}/%{name}
 %{_bindir}/%{name}
 %{_bindir}/rpmunbuilder
 
 ################################################################################
 
 %changelog
+* Tue Aug 17 2021 Anton Novojilov <andy@essentialkaos.com> - 2.9.0-0
+- Improved sources cleanup process
+
 * Thu May 14 2020 Anton Novojilov <andy@essentialkaos.com> - 2.8.0-0
 - Speeded up fetching data from git repositories
 - Show info about packaged sources size