Merge pull request #64 from essentialkaos/develop

Version 1.9.7
essentialkaos · Dec 4, 2019 · daaf0d0 · daaf0d0
2 parents 985180e + bb69f11
commit daaf0d0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -90,8 +90,8 @@ Examples:
 
 | Branch | Status |
 |--------|--------|
-| `master` | [![Build Status](https://travis-ci.org/essentialkaos/rbbuild.svg?branch=master)](https://travis-ci.org/essentialkaos/rbbuild) |
-| `develop` | [![Build Status](https://travis-ci.org/essentialkaos/rbbuild.svg?branch=develop)](https://travis-ci.org/essentialkaos/rbbuild) |
+| `master` | [![Build Status](https://travis-ci.com/essentialkaos/rbbuild.svg?branch=master)](https://travis-ci.com/essentialkaos/rbbuild) |
+| `develop` | [![Build Status](https://travis-ci.com/essentialkaos/rbbuild.svg?branch=develop)](https://travis-ci.com/essentialkaos/rbbuild) |
 
 ### License
 

diff --git a/SOURCES/rbbuild b/SOURCES/rbbuild
@@ -13,7 +13,7 @@ fi
 APP="RBBuild"
 
 # App version (String)
-VER="1.9.6"
+VER="1.9.7"
 
 ################################################################################
 
@@ -184,8 +184,6 @@ declare -A plocat
 # 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_CYAN CL_GREY CL_DARK
@@ -2380,18 +2378,6 @@ about() {
   show ""
 }
 
-# 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/SOURCES/rbdef b/SOURCES/rbdef
@@ -13,7 +13,7 @@ fi
 APP="RBBuild Def Utils"
 
 # App version (String)
-VER="1.5.3"
+VER="1.5.4"
 
 ################################################################################
 
@@ -132,8 +132,6 @@ reduced_redundancy=""
 # 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_CYAN CL_GREY CL_DARK
@@ -847,18 +845,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/rbbuild.spec b/rbbuild.spec
@@ -29,7 +29,7 @@
 
 Summary:         Utility for compiling and installing different ruby versions
 Name:            rbbuild
-Version:         1.9.6
+Version:         1.9.7
 Release:         0%{?dist}
 License:         EKOL
 Vendor:          ESSENTIALKAOS
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Wed Dec 04 2019 Anton Novojilov <andy@essentialkaos.com> - 1.9.7-0
+- Removed handler for script errors
+
 * Sat Nov 30 2019 Anton Novojilov <andy@essentialkaos.com> - 1.9.6-0
 - Added handling of SCRIPT_DEBUG environment variable for enabling debug mode
 - Added handler for script errors