diff --git a/README.md b/README.md index a7bfdb1..e6163cf 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/SOURCES/rpmbuilder b/SOURCES/rpmbuilder index 4589265..a9a6db8 100755 --- a/SOURCES/rpmbuilder +++ b/SOURCES/rpmbuilder @@ -13,7 +13,7 @@ fi APP="RPMBuilder" # Utility version (String) -VER="2.5.1" +VER="2.5.2" ################################################################################ @@ -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 @@ -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 diff --git a/SOURCES/rpmunbuilder b/SOURCES/rpmunbuilder index cc91c31..7bd5214 100755 --- a/SOURCES/rpmunbuilder +++ b/SOURCES/rpmunbuilder @@ -13,7 +13,7 @@ fi APP="RPMUnbuilder" # Utility version (String) -VER="1.1.8" +VER="1.1.9" ################################################################################ @@ -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 @@ -265,18 +263,6 @@ about() { show "Essential Kaos Open Source License " $DARK } -# Handler for errors -# -# Code: No -# Echo: No -errHandler() { - while caller $((n++)) ; do - true - done - - exit 1 -} - ## ARGUMENTS PARSING 4 ######################################################### [[ $# -eq 0 ]] && main && exit $? diff --git a/rpmbuilder.spec b/rpmbuilder.spec index 7205fdc..537b918 100644 --- a/rpmbuilder.spec +++ b/rpmbuilder.spec @@ -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 @@ -55,6 +55,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Dec 04 2019 Anton Novojilov - 2.5.2-0 +- Removed handler for script errors + * Sat Nov 30 2019 Anton Novojilov - 2.5.1-0 - Added handling of SCRIPT_DEBUG environment variable for enabling debug mode - Added handler for script errors