Skip to content

Commit

Permalink
Merge pull request #78 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 2.5.2
  • Loading branch information
andyone authored Dec 4, 2019
2 parents 33834d1 + 3dfeefb commit 42f0b72
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 33 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ Other:

| Branch | Status |
|--------|--------|
| `master` (_Stable_) | [![Build Status](https://travis-ci.org/essentialkaos/rpmbuilder.svg?branch=master)](https://travis-ci.org/essentialkaos/rpmbuilder) |
| `develop` (_Unstable_) | [![Build Status](https://travis-ci.org/essentialkaos/rpmbuilder.svg?branch=develop)](https://travis-ci.org/essentialkaos/rpmbuilder) |
| `master` (_Stable_) | [![Build Status](https://travis-ci.com/essentialkaos/rpmbuilder.svg?branch=master)](https://travis-ci.com/essentialkaos/rpmbuilder) |
| `develop` (_Unstable_) | [![Build Status](https://travis-ci.com/essentialkaos/rpmbuilder.svg?branch=develop)](https://travis-ci.com/essentialkaos/rpmbuilder) |

### Contributing

Expand Down
16 changes: 1 addition & 15 deletions SOURCES/rpmbuilder
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fi
APP="RPMBuilder"

# Utility version (String)
VER="2.5.1"
VER="2.5.2"

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

Expand Down Expand Up @@ -200,8 +200,6 @@ declare -A _requires
# Code: No
# Echo: No
main() {
trap errHandler ERR

if [[ ! -t 1 || -n "$no_colors" ]] ; then
unset NORM BOLD UNLN RED GREEN YELLOW BLUE MAG CYAN GREY DARK
unset CL_NORM CL_BOLD CL_UNLN CL_RED CL_GREEN CL_YELLOW CL_BLUE CL_MAG CL_DARK
Expand Down Expand Up @@ -511,18 +509,6 @@ about() {
show ""
}

# Handler for errors
#
# Code: No
# Echo: No
errHandler() {
while caller $((n++)) ; do
true
done

exit 1
}

## PREFS PARSING ###############################################################

unset arg argn argp
Expand Down
16 changes: 1 addition & 15 deletions SOURCES/rpmunbuilder
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fi
APP="RPMUnbuilder"

# Utility version (String)
VER="1.1.8"
VER="1.1.9"

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

Expand Down Expand Up @@ -58,8 +58,6 @@ SHORT_ARGS="h:help v:version"
# Code: No
# Echo: No
main() {
trap errHandler ERR

if [[ -n "$ver" || -n "$version" ]] ; then
about
exit 0
Expand Down Expand Up @@ -265,18 +263,6 @@ about() {
show "Essential Kaos Open Source License <https://essentialkaos.com/ekol>" $DARK
}

# Handler for errors
#
# Code: No
# Echo: No
errHandler() {
while caller $((n++)) ; do
true
done

exit 1
}

## ARGUMENTS PARSING 4 #########################################################

[[ $# -eq 0 ]] && main && exit $?
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: 2.5.1
Version: 2.5.2
Release: 0%{?dist}
License: EKOL
Group: Development/Tools
Expand Down Expand Up @@ -55,6 +55,9 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Wed Dec 04 2019 Anton Novojilov <[email protected]> - 2.5.2-0
- Removed handler for script errors

* Sat Nov 30 2019 Anton Novojilov <[email protected]> - 2.5.1-0
- Added handling of SCRIPT_DEBUG environment variable for enabling debug mode
- Added handler for script errors
Expand Down

0 comments on commit 42f0b72

Please sign in to comment.