Merge pull request #72 from essentialkaos/develop

Version 2.4.3

SOURCES/libexec/build-local.shx

@@ -263,7 +263,7 @@ localBuildProcess() {
 
       showSeparator "PACKAGE PROCESSING"
 
-      packages=$(grep -E "rpmbuild/(S|)RPMS" "$tmp_output" | cut -f2 -d" ")
+      packages=$(grep -E "rpmbuild/(S|)RPMS/.*\.rpm" "$tmp_output" | cut -f2 -d" ")
 
       rm -f "$tmp_output"
 

SOURCES/libexec/build-remote.shx

@@ -345,7 +345,7 @@ remoteBuildProcess() {
 
     showSeparator "PACKAGE PROCESSING"
 
-    packages=$(grep -E "rpmbuild/(S|)RPMS" "$tmp_output" | cut -f2 -d" ")
+    packages=$(grep -E "rpmbuild/(S|)RPMS/.*\.rpm" "$tmp_output" | cut -f2 -d" ")
 
     for package in $packages ; do
       package=$(echo "$package" | tr -dc '[:print:]')

SOURCES/libexec/build.shx

@@ -36,8 +36,12 @@ startBuild() {
 
   trap termExit SIGINT SIGQUIT SIGTERM
 
-  if [[ -n "$parallel" && $(wc -l "$remote" | cut -f1 -d" ") -gt 1 ]] ; then
-    parallelBuild "$@"
+  if [[ -n "$parallel" && $(wc -l "${remote/:*/}" | cut -f1 -d" ") -gt 1 ]] ; then
+    if [[ "${remote/:*/}" != "$remote" ]] ; then
+      basicBuild "$@"
+    else
+      parallelBuild "$@"
+    fi
   else
     basicBuild "$@"
   fi

SOURCES/rpmbuilder

@@ -5,7 +5,7 @@
 APP="RPMBuilder"
 
 # Utility version (String)
-VER="2.4.2"
+VER="2.4.3"
 
 ####################################################################
 

rpmbuilder.spec

@@ -2,7 +2,7 @@
 
 Summary:         RPM package build helper
 Name:            rpmbuilder
-Version:         2.4.2
+Version:         2.4.3
 Release:         0%{?dist}
 License:         EKOL
 Group:           Development/Tools
@@ -55,6 +55,10 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Wed Jul 03 2019 Anton Novojilov <[email protected]> - 2.4.3-0
+- Fixed bug with handling build node index in --parallel option
+- Fixed bug with handling names of built packages
+
 * Sat May 25 2019 Anton Novojilov <[email protected]> - 2.4.2-0
 - Added checking options after reading inspec options
 - Minor UI improvements