diff options
| -rwxr-xr-x | functions/common.sh | 2 | ||||
| -rwxr-xr-x | helpers/lh_build | 4 | ||||
| -rwxr-xr-x | helpers/lh_clean | 10 | ||||
| -rwxr-xr-x | helpers/lh_config | 14 | ||||
| -rwxr-xr-x | helpers/lh_source_debian-live | 4 | ||||
| -rwxr-xr-x | live-helper.sh | 4 |
6 files changed, 19 insertions, 19 deletions
diff --git a/functions/common.sh b/functions/common.sh index 84aa93c7a..2e8da0920 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -12,4 +12,4 @@ PACKAGE="live-helper" VERSION="2.0~a3-1" CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')" -PATH="${PWD}/scripts:${PATH}" +PATH="${PWD}/auto/helpers:${PATH}" diff --git a/helpers/lh_build b/helpers/lh_build index 7d5abf0f7..835ad8e2c 100755 --- a/helpers/lh_build +++ b/helpers/lh_build @@ -13,9 +13,9 @@ set -e . "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh # Read meta config -if [ "${1}" != "noautoconfig" ] && [ -x scripts/build ] +if [ "${1}" != "noautoconfig" ] && [ -x auto/build ] then - ./scripts/build ${@} + ./auto/build ${@} fi if [ "${1}" = "noautoconfig" ] diff --git a/helpers/lh_clean b/helpers/lh_clean index 29bddbdc4..8f7420930 100755 --- a/helpers/lh_clean +++ b/helpers/lh_clean @@ -10,9 +10,9 @@ set -e # Read meta config -if [ "${1}" != "noautoconfig" ] && [ -x scripts/clean ] +if [ "${1}" != "noautoconfig" ] && [ -x auto/clean ] then - ./scripts/clean ${@} + ./auto/clean ${@} fi if [ "${1}" = "noautoconfig" ] @@ -59,9 +59,9 @@ do LH=1 "${0}" noautoconfig --stage LH=1 "${0}" noautoconfig --source - if [ -d scripts ] + if [ -d auto ] then - rmdir --ignore-fail-on-non-empty scripts + rmdir --ignore-fail-on-non-empty auto fi ;; @@ -111,7 +111,7 @@ do LH=1 "${0}" --all LH=1 "${0}" --cache - if [ -e scripts/config ] + if [ -e auto/config ] then rm -f .stage/config fi diff --git a/helpers/lh_config b/helpers/lh_config index da417a3d1..3edd816bc 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -10,9 +10,9 @@ set -e # Read meta config -if [ "${1}" != "noautoconfig" ] && [ -x scripts/config ] +if [ "${1}" != "noautoconfig" ] && [ -x auto/config ] then - ./scripts/config ${@} + ./auto/config ${@} fi if [ "${1}" = "noautoconfig" ] @@ -210,14 +210,14 @@ Local_arguments () rmdir --ignore-fail-on-non-empty config fi - if [ -d scripts/functions ] + if [ -d auto/functions ] then - rmdir --ignore-fail-on-non-empty scripts/functions + rmdir --ignore-fail-on-non-empty auto/functions fi - if [ -d scripts ] + if [ -d auto ] then - rmdir --ignore-fail-on-non-empty scripts + rmdir --ignore-fail-on-non-empty auto fi exit 0 @@ -1246,7 +1246,7 @@ LH_SOURCE="${LH_SOURCE}" LH_SOURCE_IMAGES="${LH_SOURCE_IMAGES}" EOF -mkdir -p scripts/functions +mkdir -p auto/functions if [ "${CONFIG}" = "clone" ] # FIXME then diff --git a/helpers/lh_source_debian-live b/helpers/lh_source_debian-live index 391f75e21..10ba58050 100755 --- a/helpers/lh_source_debian-live +++ b/helpers/lh_source_debian-live @@ -52,9 +52,9 @@ fi mkdir -p source/debian-live cp -a config source/debian-live -if Find_files scripts/* +if Find_files auto/* then - cp -a scripts source/debian-live + cp -a auto source/debian-live fi # Create tarball diff --git a/live-helper.sh b/live-helper.sh index 626ba3f70..59d475f5b 100755 --- a/live-helper.sh +++ b/live-helper.sh @@ -9,9 +9,9 @@ do done # Source local functions -if ls scripts/functions/*.sh > /dev/null 2>&1 +if ls auto/functions/* > /dev/null 2>&1 then - for FUNCTION in scripts/functions/*.sh + for FUNCTION in auto/functions/* do . "${FUNCTION}" done |