From 250c269d049207ea87fad995b097b58fc7915fa7 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 16 Mar 2017 20:24:25 -0400 Subject: [PATCH] Minor UI fixes --- SOURCES/rpmbuilder | 30 +++++++++++++++++------------- rpmbuilder.spec | 5 ++++- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/SOURCES/rpmbuilder b/SOURCES/rpmbuilder index af9baba..a1db181 100755 --- a/SOURCES/rpmbuilder +++ b/SOURCES/rpmbuilder @@ -1,7 +1,7 @@ #!/usr/bin/env bash APP="RPMBuilder" -VER="1.6.2" +VER="1.6.3" #################################################################### @@ -695,15 +695,15 @@ remoteBuild() { $($pre) fi - [[ -n "$git" ]] && packSourcesFromGit "$spec" - [[ -n "$svn" ]] && packSourcesFromSvn "$spec" - [[ -n "$bzr" ]] && packSourcesFromBzr "$spec" - [[ -n "$hg" ]] && packSourcesFromHg "$spec" - [[ -n "$gopack" ]] && packGolangSources "$spec" + [[ -n "$git" ]] && packSourcesFromGit "$spec" && show "" + [[ -n "$svn" ]] && packSourcesFromSvn "$spec" && show "" + [[ -n "$bzr" ]] && packSourcesFromBzr "$spec" && show "" + [[ -n "$hg" ]] && packSourcesFromHg "$spec" && show "" + [[ -n "$gopack" ]] && packGolangSources "$spec" && show "" [[ -n "$repo_spec" ]] && spec="$repo_spec" - [[ -n "$pack" || -n "$source_list" ]] && packSources "$spec" + [[ -n "$pack" || -n "$source_list" ]] && packSources "$spec" && show "" processSpec "$spec" @@ -892,6 +892,7 @@ remoteBuildProcess() { fi stopStatusObserver + show "" local has_errors bld_time grc_time packages package_name package_file @@ -1040,18 +1041,19 @@ localBuild() { $($pre) fi - [[ -n "$git" ]] && packSourcesFromGit "$spec" - [[ -n "$svn" ]] && packSourcesFromSvn "$spec" - [[ -n "$bzr" ]] && packSourcesFromBzr "$spec" - [[ -n "$hg" ]] && packSourcesFromHg "$spec" - [[ -n "$gopack" ]] && packGolangSources "$spec" + [[ -n "$git" ]] && packSourcesFromGit "$spec" && show "" + [[ -n "$svn" ]] && packSourcesFromSvn "$spec" && show "" + [[ -n "$bzr" ]] && packSourcesFromBzr "$spec" && show "" + [[ -n "$hg" ]] && packSourcesFromHg "$spec" && show "" + [[ -n "$gopack" ]] && packGolangSources "$spec" && show "" [[ -n "$repo_spec" ]] && spec="$repo_spec" - [[ -n "$pack" || -n "$source_list" ]] && packSources "$spec" + [[ -n "$pack" || -n "$source_list" ]] && packSources "$spec" && show "" processSpec "$spec" + show "" show "All source files are ready for build." $GREEN copySourcesToBuildDir "$spec" @@ -1203,6 +1205,7 @@ localBuildProcess() { doExit $ERROR_BUILD else stopStatusObserver + show "" local bld_time grc_time package packages package_name package_file @@ -2721,6 +2724,7 @@ stopStatusObserver() { wait "$observer_pid" &> /dev/null showm "\r${CL_GREEN}Executing:${CL_NORM} ${CL_CYAN}clean${CL_NORM} " + show "" unset observer_pid } diff --git a/rpmbuilder.spec b/rpmbuilder.spec index bc5f45d..92ebc66 100644 --- a/rpmbuilder.spec +++ b/rpmbuilder.spec @@ -2,7 +2,7 @@ Summary: RPM package build helper Name: rpmbuilder -Version: 1.6.2 +Version: 1.6.3 Release: 0%{?dist} License: EKOL Group: Development/Tools @@ -51,6 +51,9 @@ rm -rf %{buildroot} ############################################################################### %changelog +* Fri Mar 17 2017 Anton Novojilov - 1.6.3-0 +- Minor UI fixes + * Sat Mar 11 2017 Anton Novojilov - 1.6.2-0 - Fixed bug with colors disabling - Fixed bug with changing permissions on local lock