Skip to content

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ale5000-git committed Nov 2, 2024
1 parent 7ca6b05 commit 6c3b1de
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ case "${BUILD_TYPE-}" in
esac

save_last_title
change_title 'Building the flashable OTA zip...'
set_title 'Building the flashable OTA zip...'

# shellcheck source=SCRIPTDIR/conf-1.sh
. "${MAIN_DIR}/conf-1.sh"
Expand All @@ -104,7 +104,7 @@ if test "${OPENSOURCE_ONLY:-false}" = 'false'; then . "${MAIN_DIR}/conf-2.sh"; f
if test "${OPENSOURCE_ONLY:-false}" != 'false'; then
if ! is_oss_only_build_enabled; then
echo 'WARNING: The OSS only build is disabled'
change_title 'OSS only build is disabled'
set_title 'OSS only build is disabled'
# shellcheck disable=SC2317
return 0 2>&- || exit 0
fi
Expand Down Expand Up @@ -285,7 +285,7 @@ cd "${_init_dir:?}" || ui_error 'Failed to change back the folder'

echo ''
echo 'Done.'
change_title 'Done'
set_title 'Done'

set +e

Expand Down
8 changes: 4 additions & 4 deletions includes/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ detect_os_and_other_things()
readonly PLATFORM IS_BUSYBOX PATHSEP CYGPATH SHELL_EXE SHELL_APPLET
}

change_title()
set_title()
{
test "${NO_TITLE:-0}" = '0' || return 0
test "${CI:-false}" = 'false' || return 0
Expand All @@ -203,9 +203,9 @@ change_title()
set_default_title()
{
if is_root; then
change_title "[root] Command-line: ${__TITLE_CMD_PREFIX-}${__TITLE_CMD_0-}${__TITLE_CMD_PARAMS-}"
set_title "[root] Command-line: ${__TITLE_CMD_PREFIX-}${__TITLE_CMD_0-}${__TITLE_CMD_PARAMS-}"
else
change_title "Command-line: ${__TITLE_CMD_PREFIX-}${__TITLE_CMD_0-}${__TITLE_CMD_PARAMS-}"
set_title "Command-line: ${__TITLE_CMD_PREFIX-}${__TITLE_CMD_0-}${__TITLE_CMD_PARAMS-}"
fi
A5K_TITLE_IS_DEFAULT='true'
}
Expand All @@ -224,7 +224,7 @@ restore_saved_title_if_exist()
if test "${A5K_SAVED_TITLE-}" = 'default'; then
set_default_title
elif test -n "${A5K_SAVED_TITLE-}"; then
change_title "${A5K_SAVED_TITLE:?}"
set_title "${A5K_SAVED_TITLE:?}"
fi
A5K_SAVED_TITLE=''
}
Expand Down
4 changes: 2 additions & 2 deletions tools/bits-info.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,7 @@ list_available_shells()
fi
}

clean_env()
clear_env()
{
test "${prefer_included_utilities}" != '1' || unset ASH_STANDALONE
if test "${backup_posix}" = 'unset'; then unset POSIXLY_CORRECT; else POSIXLY_CORRECT="${backup_posix}"; fi
Expand Down Expand Up @@ -1446,5 +1446,5 @@ if test "${execute_script}" = 'true'; then
if test "${backup_path}" = 'unset'; then unset PATH; else PATH="${backup_path}"; fi
fi

clean_env
clear_env
pause_if_needed "${STATUS}"

0 comments on commit 6c3b1de

Please sign in to comment.