Commit 4bbcefd9 authored by Vitaly Lipatov's avatar Vitaly Lipatov

clean up code (thanks Slava Semushin for comments)

parent 17e01c87
...@@ -7,7 +7,7 @@ set_eterbuilddir() ...@@ -7,7 +7,7 @@ set_eterbuilddir()
{ {
[ -z "$ETERBUILDDIR" ] || return 0 [ -z "$ETERBUILDDIR" ] || return 0
if dirname $0 | grep /usr >/dev/null ; then if dirname $0 | grep "^/usr" >/dev/null ; then
ETERBUILDETC=/etc/eterbuild ETERBUILDETC=/etc/eterbuild
ETERBUILDDIR=/usr/share/eterbuild ETERBUILDDIR=/usr/share/eterbuild
else else
...@@ -16,26 +16,27 @@ set_eterbuilddir() ...@@ -16,26 +16,27 @@ set_eterbuilddir()
ETERBUILDETC=$(realpath `dirname $0`/../etc) ETERBUILDETC=$(realpath `dirname $0`/../etc)
echo "Note: run from source tree, datadir=$ETERBUILDDIR, sysconfdir=$ETERBUILDETC" echo "Note: run from source tree, datadir=$ETERBUILDDIR, sysconfdir=$ETERBUILDETC"
fi fi
[ -n "$ETERBUILDDIR" ] test -n "$ETERBUILDDIR"
# returns test result
} }
# set if empty and check it # set if empty and check it
if ! set_eterbuilddir ; then if ! set_eterbuilddir ; then
echo "Can't detect package files location" echo "Can't detect package files location" >&2
exit 1 exit 1
fi fi
# #
fatal() fatal()
{ {
echog "Error: $@" echog "Error: $@" >&2
exit 1 exit 1
} }
# #
warning() warning()
{ {
echog "Warning: $@" echog "Warning: $@" >&2
} }
print_list() print_list()
......
...@@ -41,7 +41,7 @@ get_txtrelease() ...@@ -41,7 +41,7 @@ get_txtrelease()
# Obsoleted: get current release number # Obsoleted: get current release number
get_release_number() get_release_number()
{ {
echo "Obsoleted get_release_number, use get_numrelease instead" >/dev/stderr warning "Obsoleted get_release_number, use get_numrelease instead"
get_numrelease "$1" get_numrelease "$1"
} }
......
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