Skip to content

E
etersoft-build-utils
Commit cf159681 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

spec: add_changelog_helper returns 0 now if EDITOR is not set

parent 0d1bbbb5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
share/eterbuild/functions/spec
View file @ cf159681
...@@ -161,6 +161,7 @@ subst_namever() ...@@ -161,6 +161,7 @@ subst_namever()
} }
# args: "desc text" <spec(s)>
add_changelog_helper() add_changelog_helper()
{ {
# it is permitted to run with "" DESC # it is permitted to run with "" DESC
...@@ -168,13 +169,13 @@ add_changelog_helper() ...@@ -168,13 +169,13 @@ add_changelog_helper()
shift shift
local SPECS="$*" local SPECS="$*"
if ! tty -s && [ -z "$DESC" ] ; then if ! tty -s && [ -z "$DESC" ] ; then
echo "skip changelog fixing without tty" echo "skip changelog fixing without tty and without desc"
return 1 return 1
fi fi
[ -z "$SPECS" ] && fatal "run add_changelog with incorrect args" [ -z "$SPECS" ] && fatal "run add_changelog without spec(s)"
add_changelog -e "$DESC" $SPECS add_changelog -e "$DESC" $SPECS
R=$? R=$?
[ -z "$EDITOR" ] && { echo "skip changelog editing without EDITOR var"; return 1 ; } [ -z "$EDITOR" ] && { echo "skip changelog editing without EDITOR var"; return 0 ; }
# If changelog sucessfully added # If changelog sucessfully added
if [ "$R" = "0" ]; then if [ "$R" = "0" ]; then
local SPEC local SPEC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment