diff options
| -rwxr-xr-x | scripts/build/source | 2 | ||||
| -rwxr-xr-x | scripts/build/source_checksums | 2 | ||||
| -rwxr-xr-x | scripts/build/source_live (renamed from scripts/build/source_debian-live) | 16 | ||||
| -rwxr-xr-x | scripts/build/source_tar | 12 |
4 files changed, 16 insertions, 16 deletions
diff --git a/scripts/build/source b/scripts/build/source index 9866312d1..4d4e9f0e1 100755 --- a/scripts/build/source +++ b/scripts/build/source @@ -48,7 +48,7 @@ lb chroot_hostname install ${@} lb chroot_archives source install ${@} # Preparing images -lb source_debian-live ${@} +lb source_live ${@} lb source_debian ${@} lb source_disk ${@} lb source_hooks ${@} diff --git a/scripts/build/source_checksums b/scripts/build/source_checksums index 96e10e5ea..e3a222aa8 100755 --- a/scripts/build/source_checksums +++ b/scripts/build/source_checksums @@ -41,7 +41,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -for DIRECTORY in source/debian source/debian-live +for DIRECTORY in source/debian source/live do if [ ! -d ${DIRECTORY} ] then diff --git a/scripts/build/source_debian-live b/scripts/build/source_live index 90c9216a8..d833a5dab 100755 --- a/scripts/build/source_debian-live +++ b/scripts/build/source_live @@ -14,7 +14,7 @@ set -e [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh # Setting static variables -DESCRIPTION="$(Echo 'copy debian-live config into source')" +DESCRIPTION="$(Echo 'copy live config into source')" HELP="" USAGE="${PROGRAM} [--force]" @@ -35,7 +35,7 @@ Echo_message "Begin copying live-build configuration..." Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .build/source_debian-live +Check_stagefile .build/source_live # Checking lock file Check_lockfile .lock @@ -44,19 +44,19 @@ Check_lockfile .lock Create_lockfile .lock # Remove old sources -if [ -d source/debian-live ] +if [ -d source/live ] then - rm -rf source/debian-live + rm -rf source/live fi # Copy system configuration -mkdir -p source/debian-live -cp -a config source/debian-live +mkdir -p source/live +cp -a config source/live if Find_files auto/* then - cp -a auto source/debian-live + cp -a auto source/live fi # Creating stage file -Create_stagefile .build/source_debian-live +Create_stagefile .build/source_live diff --git a/scripts/build/source_tar b/scripts/build/source_tar index 9113f22a9..88410058c 100755 --- a/scripts/build/source_tar +++ b/scripts/build/source_tar @@ -51,30 +51,30 @@ Create_lockfile .lock # Remove old source rm -f ${LIVE_IMAGE_NAME}-source.debian.tar.bz2 ${LIVE_IMAGE_NAME}-source.debian.tar.gz ${LIVE_IMAGE_NAME}-source.debian.tar.lz ${LIVE_IMAGE_NAME}-source.debian.tar -rm -f ${LIVE_IMAGE_NAME}-source.debian-live.tar.bz2 ${LIVE_IMAGE_NAME}-source.debian-live.tar.gz ${LIVE_IMAGE_NAME}-source.debian-live.tar.lz ${LIVE_IMAGE_NAME}-source.debian-live.tar +rm -f ${LIVE_IMAGE_NAME}-source.live.tar.bz2 ${LIVE_IMAGE_NAME}-source.live.tar.gz ${LIVE_IMAGE_NAME}-source.live.tar.lz ${LIVE_IMAGE_NAME}-source.live.tar tar cf ${LIVE_IMAGE_NAME}-source.debian.tar source/debian -tar cf ${LIVE_IMAGE_NAME}-source.debian-live.tar source/debian-live +tar cf ${LIVE_IMAGE_NAME}-source.live.tar source/live case "${LB_COMPRESSION}" in bzip2) bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian.tar - bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian-live.tar + bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-source.live.tar ;; gzip) gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian.tar - gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian-live.tar + gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-source.live.tar ;; lzip) lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian.tar - lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian-live.tar + lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-source.live.tar ;; xz) xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian.tar - xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian-live.tar + xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-source.live.tar ;; none) |