diff options
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/binary_hooks | 4 | ||||
| -rwxr-xr-x | scripts/build/chroot_hooks | 4 | ||||
| -rwxr-xr-x | scripts/build/config | 8 | ||||
| -rwxr-xr-x | scripts/build/source_hooks | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/scripts/build/binary_hooks b/scripts/build/binary_hooks index 9cf2f92cf..bdad671cc 100755 --- a/scripts/build/binary_hooks +++ b/scripts/build/binary_hooks @@ -59,9 +59,9 @@ done ## Processing local hooks -if Find_files config/hooks/*.binary +if Find_files config/hooks/live/*.binary then - for HOOK in config/hooks/*.binary + for HOOK in config/hooks/live/*.binary do # Making hook executable if [ ! -x "${HOOK}" ] diff --git a/scripts/build/chroot_hooks b/scripts/build/chroot_hooks index f9ca5ee81..e25f3b7fd 100755 --- a/scripts/build/chroot_hooks +++ b/scripts/build/chroot_hooks @@ -79,12 +79,12 @@ fi ## Processing local hooks -if Find_files config/hooks/*.chroot +if Find_files config/hooks/live/*.chroot then # Restoring cache Restore_cache cache/packages.chroot - for _HOOK in config/hooks/*.chroot + for _HOOK in config/hooks/live/*.chroot do # Copying hook cp "${_HOOK}" chroot/root diff --git a/scripts/build/config b/scripts/build/config index 5c0c92dd3..d713314ac 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -1312,16 +1312,16 @@ then rmdir --ignore-fail-on-non-empty local > /dev/null 2>&1 || true fi -mkdir -p config/hooks +mkdir -p config/hooks/live mkdir -p config/includes config/includes.bootstrap config/includes.chroot config/includes.binary config/includes.source Echo_message "Symlinking hooks..." -for _HOOK in "${LIVE_BUILD}"/share/hooks/*.hook* /usr/share/live/build/hooks/*.hook* +for _HOOK in "${LIVE_BUILD}"/share/hooks/live/*.hook* /usr/share/live/build/hooks/live/*.hook* do - if [ -e "${_HOOK}" ] && [ ! -e "config/hooks/$(basename ${_HOOK})" ] + if [ -e "${_HOOK}" ] && [ ! -e "config/hooks/live/$(basename ${_HOOK})" ] then - ln -s "${_HOOK}" "config/hooks/$(basename ${_HOOK})" + ln -s "${_HOOK}" "config/hooks/live/$(basename ${_HOOK})" fi done diff --git a/scripts/build/source_hooks b/scripts/build/source_hooks index 6a98300cc..6f3e08dcd 100755 --- a/scripts/build/source_hooks +++ b/scripts/build/source_hooks @@ -59,9 +59,9 @@ done ## Processing local hooks -if Find_files config/hooks/*.source +if Find_files config/hooks/live/*.source then - for HOOK in config/hooks/*.source + for HOOK in config/hooks/live/*.source do # Making hook executable if [ ! -x "${HOOK}" ] |