File tree Expand file tree Collapse file tree 4 files changed +6
-6
lines changed
Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -65,8 +65,8 @@ export BUILD_CACHE_DIR="${MAIN_DIR:?}/cache/build"
6565export LFS_CACHE_DIR=" ${MAIN_DIR:? } /cache/lfs"
6666
6767unset DO_INIT_CMDLINE
68- # shellcheck source=SCRIPTDIR/includes /common.sh
69- if test " ${A5K_FUNCTIONS_INCLUDED:- false} " = ' false' ; then . " ${MAIN_DIR:? } /includes /common.sh" ; fi
68+ # shellcheck source=SCRIPTDIR/lib /common.lib .sh
69+ if test " ${A5K_FUNCTIONS_INCLUDED:- false} " = ' false' ; then . " ${MAIN_DIR:? } /lib /common.lib .sh" ; fi
7070
7171if test -n " ${OPENSOURCE_ONLY-} " ; then
7272 ui_error ' You must set BUILD_TYPE instead of OPENSOURCE_ONLY' " ${LINENO-} " " ${FUNCNAME-} "
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ SET "IS_PATH_INITIALIZED="
2929SET " __QUOTED_PARAMS = "
3030SET " __SHELL_EXE = %~dp0 tools\win\busybox.exe"
3131
32- " %__SHELL_EXE% " ash -s -c " . '%~dp0 includes \common.sh' || exit ${?}" " ash" %*
32+ " %__SHELL_EXE% " ash -s -c " . '%~dp0 lib \common.lib .sh' || exit ${?}" " ash" %*
3333
3434ENDLOCAL 2 > nul
3535IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
Original file line number Diff line number Diff line change @@ -99,10 +99,10 @@ if test "${A5K_FUNCTIONS_INCLUDED:-false}" = 'false'; then
9999 unset __QUOTED_PARAMS
100100
101101 if test " ${_run_strategy} " = ' source' ; then
102- . " ${_main_dir} /includes /common.sh" " ${@ } " || return " ${?} "
102+ . " ${_main_dir} /lib /common.lib .sh" " ${@ } " || return " ${?} "
103103 elif test " ${_run_strategy} " = ' s-opt' ; then
104104 # shellcheck disable=SC2086 # Ignore: Double quote to prevent globbing and word splitting
105- exec " ${__SHELL_EXE} " ${_applet} -s -c " . '${_main_dir} /includes /common.sh' || exit \$ {?}" " ${_applet:- ${0-} } " " ${@ } "
105+ exec " ${__SHELL_EXE} " ${_applet} -s -c " . '${_main_dir} /lib /common.lib .sh' || exit \$ {?}" " ${_applet:- ${0-} } " " ${@ } "
106106 else
107107 if test " ${# } " -gt 0; then
108108 _nl=" $( printf ' \nx' ) " _nl=" ${_nl% x} "
@@ -117,7 +117,7 @@ if test "${A5K_FUNCTIONS_INCLUDED:-false}" = 'false'; then
117117 fi
118118
119119 # shellcheck disable=SC2086 # Ignore: Double quote to prevent globbing and word splitting
120- exec " ${__SHELL_EXE} " ${_applet} --init-file " ${_main_dir} /includes /common.sh"
120+ exec " ${__SHELL_EXE} " ${_applet} --init-file " ${_main_dir} /lib /common.lib .sh"
121121 fi
122122 }
123123
File renamed without changes.
You can’t perform that action at this time.
0 commit comments