Skip to content

Commit

Permalink
Merge pull request #36 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 1.6.3
  • Loading branch information
andyone authored Mar 17, 2017
2 parents efac101 + 250c269 commit 188740d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 14 deletions.
30 changes: 17 additions & 13 deletions SOURCES/rpmbuilder
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

APP="RPMBuilder"
VER="1.6.2"
VER="1.6.3"

####################################################################

Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -892,6 +892,7 @@ remoteBuildProcess() {
fi

stopStatusObserver

show ""

local has_errors bld_time grc_time packages package_name package_file
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -1203,6 +1205,7 @@ localBuildProcess() {
doExit $ERROR_BUILD
else
stopStatusObserver

show ""

local bld_time grc_time package packages package_name package_file
Expand Down Expand Up @@ -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
}
Expand Down
5 changes: 4 additions & 1 deletion rpmbuilder.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -51,6 +51,9 @@ rm -rf %{buildroot}
###############################################################################

%changelog
* Fri Mar 17 2017 Anton Novojilov <[email protected]> - 1.6.3-0
- Minor UI fixes

* Sat Mar 11 2017 Anton Novojilov <[email protected]> - 1.6.2-0
- Fixed bug with colors disabling
- Fixed bug with changing permissions on local lock
Expand Down

0 comments on commit 188740d

Please sign in to comment.