manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't unnecessarily convert exit codes to strings 

Closes: #952861
This commit is contained in:
Lyndon Brown 2020-02-12 02:40:38 +00:00 committed by Raphaël Hertzog
parent f3544ff68e
commit 2511fff259
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions/arguments.sh
View File

@ -12,7 +12,7 @@ Arguments ()
{ {
ARGUMENTS="$(getopt --longoptions breakpoints,color,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options c:huv --shell sh -- "${@}")" ARGUMENTS="$(getopt --longoptions breakpoints,color,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options c:huv --shell sh -- "${@}")"
if [ "${?}" != "0" ] if [ $? -ne 0 ]
then then
Echo_error "terminating" >&2 Echo_error "terminating" >&2
exit 1 exit 1

2
functions/chroot.sh
View File

@ -34,7 +34,7 @@ Chroot ()
${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NONINTERACTIVE_SEEN="true" DEBCONF_NOWARNINGS="true" ${ENV} ${COMMANDS} ${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NONINTERACTIVE_SEEN="true" DEBCONF_NOWARNINGS="true" ${ENV} ${COMMANDS}
return "${?}" return ${?}
} }
Chroot_has_package() { Chroot_has_package() {

6
functions/echo.sh
View File

@ -149,11 +149,11 @@ Echo_warning ()
Echo_status () Echo_status ()
{ {
__RETURN="${?}" __RETURN=$?
if [ "${_COLOR}" = "false" ] if [ "${_COLOR}" = "false" ]
then then
if [ "${__RETURN}" = "0" ] if [ $__RETURN -eq 0 ]
then then
printf " done.\n" printf " done.\n"
else else
@ -162,7 +162,7 @@ Echo_status ()
else else
Cursor_columns_backward 8 Cursor_columns_backward 8
if [ "${__RETURN}" = "0" ] if [ $__RETURN -eq 0 ]
then then
printf " ${GREEN}done${NO_COLOR}. \n" printf " ${GREEN}done${NO_COLOR}. \n"
else else

2
functions/exit.sh
View File

@ -10,7 +10,7 @@
Exit () Exit ()
{ {
VALUE="${?}" VALUE=$?
if [ "${_DEBUG}" = "true" ] if [ "${_DEBUG}" = "true" ]
then then

3
scripts/build/config
View File

@ -166,8 +166,7 @@ Local_arguments ()
LONG_OPTIONS="$(echo ${LONG_OPTIONS} | tr -d ' ')" LONG_OPTIONS="$(echo ${LONG_OPTIONS} | tr -d ' ')"
ARGUMENTS="$(getopt --longoptions ${LONG_OPTIONS} --name="${PROGRAM}" --options a:d:m:k:b:s:c:huv --shell sh -- "${@}")" ARGUMENTS="$(getopt --longoptions ${LONG_OPTIONS} --name="${PROGRAM}" --options a:d:m:k:b:s:c:huv --shell sh -- "${@}")"
if [ "${?}" != "0" ] if [ $? -ne 0 ]; then
then
Echo_error "terminating" >&2 Echo_error "terminating" >&2
exit 1 exit 1
fi fi