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

frontend: tidy 

no need to have exit in both conditions

no need to have most of the script within a case branch when all other
cases result in an exit.

Gbp-Dch: Short
This commit is contained in:
Lyndon Brown 2020-03-11 22:33:50 +00:00 committed by Raphaël Hertzog
parent 9f42bc1bdc
commit 67930f3e6e
1 changed files with 41 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
frontend/lb
View File

@ -21,14 +21,12 @@ USAGE="lb {clean|config|build}"
case "${1}" in
-h|--help)
if [ $(which man) ]
then
if [ $(which man) ]; then
man lb
exit 0
else
${0} --usage
exit 0
fi
exit 0
;;
""|-u|--usage)
@ -39,53 +37,43 @@ case "${1}" in
echo "${VERSION}"
exit 0
;;
esac
*)
COMMAND="${1}"
shift
COMMAND="${1}"
shift
ENV=""
ENV=""
if [ "${COMMAND}" != "config" ]
then
if [ "${COMMAND}" != "config" ]; then
# Checking user account
if [ "$(id -u)" -ne "0" ]
then
if [ "$(id -u)" -ne "0" ]; then
Echo_error "Root privileges needed!"
exit 1
fi
fi
fi
for _FILE in config/environment config/environment.binary
do
if [ -e "${_FILE}" ]
then
for _FILE in config/environment config/environment.binary; do
if [ -e "${_FILE}" ]; then
ENV="${ENV} $(grep -v '^#' ${_FILE})"
fi
done
done
if [ -x "${LIVE_BUILD}/scripts/build/${COMMAND}" ]
then
if [ -x "${LIVE_BUILD}/scripts/build/${COMMAND}" ]; then
# User has live-build copied locally in the system
SCRIPT="${LIVE_BUILD}/scripts/build/${COMMAND}"
elif [ -x "local/live-build/scripts/build/${COMMAND}" ]
then
elif [ -x "local/live-build/scripts/build/${COMMAND}" ]; then
# User has live-build copied locally in the config
SCRIPT="local/live-build/scripts/build/${COMMAND}"
elif [ -x /usr/lib/live/build/${COMMAND} ]
then
SCRIPT="local/live-build/scripts/build/${COMMAND}";
elif [ -x /usr/lib/live/build/${COMMAND} ]; then
# User has live-build installed in the system
SCRIPT=/usr/lib/live/build/"${COMMAND}"
elif [ $(which "${COMMAND}") ]
then
elif [ $(which "${COMMAND}") ]; then
# User has live-build commands in path
SCRIPT="${COMMAND}"
else
else
Echo_error "No such script: ${COMMAND}"
exit 1
fi
fi
Echo "[%s] %s" "$(date +'%F %T')" "lb ${COMMAND} $(echo ${@})"
${ENV} exec "${SCRIPT}" "${@}"
;;
esac
Echo "[%s] %s" "$(date +'%F %T')" "lb ${COMMAND} $(echo ${@})"
${ENV} exec "${SCRIPT}" "${@}"