From 3b80c5c5d9c9d2eec91910b70a120da5943c7fac Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 5 Feb 2010 17:10:44 +0100 Subject: [PATCH] Dropping lh_ prefix from internal helpers, this is not user visible. --- helpers/{lh_binary => binary} | 0 helpers/{lh_binary_chroot => binary_chroot} | 0 ...nary_debian-installer => binary_debian-installer} | 0 helpers/{lh_binary_disk => binary_disk} | 0 helpers/{lh_binary_encryption => binary_encryption} | 0 helpers/{lh_binary_grub => binary_grub} | 0 helpers/{lh_binary_grub2 => binary_grub2} | 0 helpers/{lh_binary_includes => binary_includes} | 0 helpers/{lh_binary_iso => binary_iso} | 0 .../{lh_binary_linux-image => binary_linux-image} | 0 .../{lh_binary_local-hooks => binary_local-hooks} | 0 ...h_binary_local-includes => binary_local-includes} | 0 ...ocal-packageslists => binary_local-packageslists} | 0 helpers/{lh_binary_manifest => binary_manifest} | 0 helpers/{lh_binary_md5sum => binary_md5sum} | 0 helpers/{lh_binary_memtest => binary_memtest} | 0 helpers/{lh_binary_net => binary_net} | 0 helpers/{lh_binary_rootfs => binary_rootfs} | 0 helpers/{lh_binary_silo => binary_silo} | 0 helpers/{lh_binary_syslinux => binary_syslinux} | 0 helpers/{lh_binary_tar => binary_tar} | 0 helpers/{lh_binary_usb-hdd => binary_usb-hdd} | 0 .../{lh_binary_virtual-hdd => binary_virtual-hdd} | 0 .../{lh_binary_win32-loader => binary_win32-loader} | 0 helpers/{lh_binary_yaboot => binary_yaboot} | 0 helpers/{lh_bootstrap => bootstrap} | 0 helpers/{lh_bootstrap_cache => bootstrap_cache} | 0 ...bootstrap_cdebootstrap => bootstrap_cdebootstrap} | 0 helpers/{lh_bootstrap_copy => bootstrap_copy} | 0 ...h_bootstrap_debootstrap => bootstrap_debootstrap} | 0 helpers/{lh_build => build} | 0 helpers/{lh_chroot => chroot} | 0 helpers/{lh_chroot_apt => chroot_apt} | 0 helpers/{lh_chroot_cache => chroot_cache} | 0 .../{lh_chroot_debianchroot => chroot_debianchroot} | 0 helpers/{lh_chroot_devpts => chroot_devpts} | 0 helpers/{lh_chroot_dpkg => chroot_dpkg} | 0 helpers/{lh_chroot_hacks => chroot_hacks} | 0 helpers/{lh_chroot_hooks => chroot_hooks} | 0 helpers/{lh_chroot_hostname => chroot_hostname} | 0 helpers/{lh_chroot_hosts => chroot_hosts} | 0 ...root_install-packages => chroot_install-packages} | 0 .../{lh_chroot_interactive => chroot_interactive} | 0 .../{lh_chroot_linux-image => chroot_linux-image} | 0 .../{lh_chroot_local-hooks => chroot_local-hooks} | 0 ...h_chroot_local-includes => chroot_local-includes} | 0 ...h_chroot_local-packages => chroot_local-packages} | 0 ...ocal-packageslists => chroot_local-packageslists} | 0 ...{lh_chroot_local-patches => chroot_local-patches} | 0 ...{lh_chroot_local-preseed => chroot_local-preseed} | 0 .../{lh_chroot_localization => chroot_localization} | 0 helpers/{lh_chroot_packages => chroot_packages} | 0 ...{lh_chroot_packageslists => chroot_packageslists} | 0 helpers/{lh_chroot_preseed => chroot_preseed} | 0 helpers/{lh_chroot_proc => chroot_proc} | 0 helpers/{lh_chroot_resolv => chroot_resolv} | 0 helpers/{lh_chroot_selinuxfs => chroot_selinuxfs} | 0 helpers/{lh_chroot_sources => chroot_sources} | 0 helpers/{lh_chroot_symlinks => chroot_symlinks} | 0 helpers/{lh_chroot_sysfs => chroot_sysfs} | 0 helpers/{lh_chroot_sysv-rc => chroot_sysv-rc} | 0 helpers/{lh_chroot_sysvinit => chroot_sysvinit} | 0 helpers/{lh_chroot_tasks => chroot_tasks} | 0 helpers/{lh_clean => clean} | 0 helpers/{lh_config => config} | 0 helpers/lh | 12 ++++++------ helpers/{lh_local => local} | 0 helpers/{lh_source => source} | 0 helpers/{lh_source_debian => source_debian} | 0 .../{lh_source_debian-live => source_debian-live} | 0 helpers/{lh_source_disk => source_disk} | 0 helpers/{lh_source_iso => source_iso} | 0 helpers/{lh_source_md5sum => source_md5sum} | 0 helpers/{lh_source_net => source_net} | 0 helpers/{lh_source_tar => source_tar} | 0 helpers/{lh_source_usb-hdd => source_usb-hdd} | 0 .../{lh_source_virtual-hdd => source_virtual-hdd} | 0 helpers/{lh_testroot => testroot} | 0 78 files changed, 6 insertions(+), 6 deletions(-) rename helpers/{lh_binary => binary} (100%) rename helpers/{lh_binary_chroot => binary_chroot} (100%) rename helpers/{lh_binary_debian-installer => binary_debian-installer} (100%) rename helpers/{lh_binary_disk => binary_disk} (100%) rename helpers/{lh_binary_encryption => binary_encryption} (100%) rename helpers/{lh_binary_grub => binary_grub} (100%) rename helpers/{lh_binary_grub2 => binary_grub2} (100%) rename helpers/{lh_binary_includes => binary_includes} (100%) rename helpers/{lh_binary_iso => binary_iso} (100%) rename helpers/{lh_binary_linux-image => binary_linux-image} (100%) rename helpers/{lh_binary_local-hooks => binary_local-hooks} (100%) rename helpers/{lh_binary_local-includes => binary_local-includes} (100%) rename helpers/{lh_binary_local-packageslists => binary_local-packageslists} (100%) rename helpers/{lh_binary_manifest => binary_manifest} (100%) rename helpers/{lh_binary_md5sum => binary_md5sum} (100%) rename helpers/{lh_binary_memtest => binary_memtest} (100%) rename helpers/{lh_binary_net => binary_net} (100%) rename helpers/{lh_binary_rootfs => binary_rootfs} (100%) rename helpers/{lh_binary_silo => binary_silo} (100%) rename helpers/{lh_binary_syslinux => binary_syslinux} (100%) rename helpers/{lh_binary_tar => binary_tar} (100%) rename helpers/{lh_binary_usb-hdd => binary_usb-hdd} (100%) rename helpers/{lh_binary_virtual-hdd => binary_virtual-hdd} (100%) rename helpers/{lh_binary_win32-loader => binary_win32-loader} (100%) rename helpers/{lh_binary_yaboot => binary_yaboot} (100%) rename helpers/{lh_bootstrap => bootstrap} (100%) rename helpers/{lh_bootstrap_cache => bootstrap_cache} (100%) rename helpers/{lh_bootstrap_cdebootstrap => bootstrap_cdebootstrap} (100%) rename helpers/{lh_bootstrap_copy => bootstrap_copy} (100%) rename helpers/{lh_bootstrap_debootstrap => bootstrap_debootstrap} (100%) rename helpers/{lh_build => build} (100%) rename helpers/{lh_chroot => chroot} (100%) rename helpers/{lh_chroot_apt => chroot_apt} (100%) rename helpers/{lh_chroot_cache => chroot_cache} (100%) rename helpers/{lh_chroot_debianchroot => chroot_debianchroot} (100%) rename helpers/{lh_chroot_devpts => chroot_devpts} (100%) rename helpers/{lh_chroot_dpkg => chroot_dpkg} (100%) rename helpers/{lh_chroot_hacks => chroot_hacks} (100%) rename helpers/{lh_chroot_hooks => chroot_hooks} (100%) rename helpers/{lh_chroot_hostname => chroot_hostname} (100%) rename helpers/{lh_chroot_hosts => chroot_hosts} (100%) rename helpers/{lh_chroot_install-packages => chroot_install-packages} (100%) rename helpers/{lh_chroot_interactive => chroot_interactive} (100%) rename helpers/{lh_chroot_linux-image => chroot_linux-image} (100%) rename helpers/{lh_chroot_local-hooks => chroot_local-hooks} (100%) rename helpers/{lh_chroot_local-includes => chroot_local-includes} (100%) rename helpers/{lh_chroot_local-packages => chroot_local-packages} (100%) rename helpers/{lh_chroot_local-packageslists => chroot_local-packageslists} (100%) rename helpers/{lh_chroot_local-patches => chroot_local-patches} (100%) rename helpers/{lh_chroot_local-preseed => chroot_local-preseed} (100%) rename helpers/{lh_chroot_localization => chroot_localization} (100%) rename helpers/{lh_chroot_packages => chroot_packages} (100%) rename helpers/{lh_chroot_packageslists => chroot_packageslists} (100%) rename helpers/{lh_chroot_preseed => chroot_preseed} (100%) rename helpers/{lh_chroot_proc => chroot_proc} (100%) rename helpers/{lh_chroot_resolv => chroot_resolv} (100%) rename helpers/{lh_chroot_selinuxfs => chroot_selinuxfs} (100%) rename helpers/{lh_chroot_sources => chroot_sources} (100%) rename helpers/{lh_chroot_symlinks => chroot_symlinks} (100%) rename helpers/{lh_chroot_sysfs => chroot_sysfs} (100%) rename helpers/{lh_chroot_sysv-rc => chroot_sysv-rc} (100%) rename helpers/{lh_chroot_sysvinit => chroot_sysvinit} (100%) rename helpers/{lh_chroot_tasks => chroot_tasks} (100%) rename helpers/{lh_clean => clean} (100%) rename helpers/{lh_config => config} (100%) rename helpers/{lh_local => local} (100%) rename helpers/{lh_source => source} (100%) rename helpers/{lh_source_debian => source_debian} (100%) rename helpers/{lh_source_debian-live => source_debian-live} (100%) rename helpers/{lh_source_disk => source_disk} (100%) rename helpers/{lh_source_iso => source_iso} (100%) rename helpers/{lh_source_md5sum => source_md5sum} (100%) rename helpers/{lh_source_net => source_net} (100%) rename helpers/{lh_source_tar => source_tar} (100%) rename helpers/{lh_source_usb-hdd => source_usb-hdd} (100%) rename helpers/{lh_source_virtual-hdd => source_virtual-hdd} (100%) rename helpers/{lh_testroot => testroot} (100%) diff --git a/helpers/lh_binary b/helpers/binary similarity index 100% rename from helpers/lh_binary rename to helpers/binary diff --git a/helpers/lh_binary_chroot b/helpers/binary_chroot similarity index 100% rename from helpers/lh_binary_chroot rename to helpers/binary_chroot diff --git a/helpers/lh_binary_debian-installer b/helpers/binary_debian-installer similarity index 100% rename from helpers/lh_binary_debian-installer rename to helpers/binary_debian-installer diff --git a/helpers/lh_binary_disk b/helpers/binary_disk similarity index 100% rename from helpers/lh_binary_disk rename to helpers/binary_disk diff --git a/helpers/lh_binary_encryption b/helpers/binary_encryption similarity index 100% rename from helpers/lh_binary_encryption rename to helpers/binary_encryption diff --git a/helpers/lh_binary_grub b/helpers/binary_grub similarity index 100% rename from helpers/lh_binary_grub rename to helpers/binary_grub diff --git a/helpers/lh_binary_grub2 b/helpers/binary_grub2 similarity index 100% rename from helpers/lh_binary_grub2 rename to helpers/binary_grub2 diff --git a/helpers/lh_binary_includes b/helpers/binary_includes similarity index 100% rename from helpers/lh_binary_includes rename to helpers/binary_includes diff --git a/helpers/lh_binary_iso b/helpers/binary_iso similarity index 100% rename from helpers/lh_binary_iso rename to helpers/binary_iso diff --git a/helpers/lh_binary_linux-image b/helpers/binary_linux-image similarity index 100% rename from helpers/lh_binary_linux-image rename to helpers/binary_linux-image diff --git a/helpers/lh_binary_local-hooks b/helpers/binary_local-hooks similarity index 100% rename from helpers/lh_binary_local-hooks rename to helpers/binary_local-hooks diff --git a/helpers/lh_binary_local-includes b/helpers/binary_local-includes similarity index 100% rename from helpers/lh_binary_local-includes rename to helpers/binary_local-includes diff --git a/helpers/lh_binary_local-packageslists b/helpers/binary_local-packageslists similarity index 100% rename from helpers/lh_binary_local-packageslists rename to helpers/binary_local-packageslists diff --git a/helpers/lh_binary_manifest b/helpers/binary_manifest similarity index 100% rename from helpers/lh_binary_manifest rename to helpers/binary_manifest diff --git a/helpers/lh_binary_md5sum b/helpers/binary_md5sum similarity index 100% rename from helpers/lh_binary_md5sum rename to helpers/binary_md5sum diff --git a/helpers/lh_binary_memtest b/helpers/binary_memtest similarity index 100% rename from helpers/lh_binary_memtest rename to helpers/binary_memtest diff --git a/helpers/lh_binary_net b/helpers/binary_net similarity index 100% rename from helpers/lh_binary_net rename to helpers/binary_net diff --git a/helpers/lh_binary_rootfs b/helpers/binary_rootfs similarity index 100% rename from helpers/lh_binary_rootfs rename to helpers/binary_rootfs diff --git a/helpers/lh_binary_silo b/helpers/binary_silo similarity index 100% rename from helpers/lh_binary_silo rename to helpers/binary_silo diff --git a/helpers/lh_binary_syslinux b/helpers/binary_syslinux similarity index 100% rename from helpers/lh_binary_syslinux rename to helpers/binary_syslinux diff --git a/helpers/lh_binary_tar b/helpers/binary_tar similarity index 100% rename from helpers/lh_binary_tar rename to helpers/binary_tar diff --git a/helpers/lh_binary_usb-hdd b/helpers/binary_usb-hdd similarity index 100% rename from helpers/lh_binary_usb-hdd rename to helpers/binary_usb-hdd diff --git a/helpers/lh_binary_virtual-hdd b/helpers/binary_virtual-hdd similarity index 100% rename from helpers/lh_binary_virtual-hdd rename to helpers/binary_virtual-hdd diff --git a/helpers/lh_binary_win32-loader b/helpers/binary_win32-loader similarity index 100% rename from helpers/lh_binary_win32-loader rename to helpers/binary_win32-loader diff --git a/helpers/lh_binary_yaboot b/helpers/binary_yaboot similarity index 100% rename from helpers/lh_binary_yaboot rename to helpers/binary_yaboot diff --git a/helpers/lh_bootstrap b/helpers/bootstrap similarity index 100% rename from helpers/lh_bootstrap rename to helpers/bootstrap diff --git a/helpers/lh_bootstrap_cache b/helpers/bootstrap_cache similarity index 100% rename from helpers/lh_bootstrap_cache rename to helpers/bootstrap_cache diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/bootstrap_cdebootstrap similarity index 100% rename from helpers/lh_bootstrap_cdebootstrap rename to helpers/bootstrap_cdebootstrap diff --git a/helpers/lh_bootstrap_copy b/helpers/bootstrap_copy similarity index 100% rename from helpers/lh_bootstrap_copy rename to helpers/bootstrap_copy diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/bootstrap_debootstrap similarity index 100% rename from helpers/lh_bootstrap_debootstrap rename to helpers/bootstrap_debootstrap diff --git a/helpers/lh_build b/helpers/build similarity index 100% rename from helpers/lh_build rename to helpers/build diff --git a/helpers/lh_chroot b/helpers/chroot similarity index 100% rename from helpers/lh_chroot rename to helpers/chroot diff --git a/helpers/lh_chroot_apt b/helpers/chroot_apt similarity index 100% rename from helpers/lh_chroot_apt rename to helpers/chroot_apt diff --git a/helpers/lh_chroot_cache b/helpers/chroot_cache similarity index 100% rename from helpers/lh_chroot_cache rename to helpers/chroot_cache diff --git a/helpers/lh_chroot_debianchroot b/helpers/chroot_debianchroot similarity index 100% rename from helpers/lh_chroot_debianchroot rename to helpers/chroot_debianchroot diff --git a/helpers/lh_chroot_devpts b/helpers/chroot_devpts similarity index 100% rename from helpers/lh_chroot_devpts rename to helpers/chroot_devpts diff --git a/helpers/lh_chroot_dpkg b/helpers/chroot_dpkg similarity index 100% rename from helpers/lh_chroot_dpkg rename to helpers/chroot_dpkg diff --git a/helpers/lh_chroot_hacks b/helpers/chroot_hacks similarity index 100% rename from helpers/lh_chroot_hacks rename to helpers/chroot_hacks diff --git a/helpers/lh_chroot_hooks b/helpers/chroot_hooks similarity index 100% rename from helpers/lh_chroot_hooks rename to helpers/chroot_hooks diff --git a/helpers/lh_chroot_hostname b/helpers/chroot_hostname similarity index 100% rename from helpers/lh_chroot_hostname rename to helpers/chroot_hostname diff --git a/helpers/lh_chroot_hosts b/helpers/chroot_hosts similarity index 100% rename from helpers/lh_chroot_hosts rename to helpers/chroot_hosts diff --git a/helpers/lh_chroot_install-packages b/helpers/chroot_install-packages similarity index 100% rename from helpers/lh_chroot_install-packages rename to helpers/chroot_install-packages diff --git a/helpers/lh_chroot_interactive b/helpers/chroot_interactive similarity index 100% rename from helpers/lh_chroot_interactive rename to helpers/chroot_interactive diff --git a/helpers/lh_chroot_linux-image b/helpers/chroot_linux-image similarity index 100% rename from helpers/lh_chroot_linux-image rename to helpers/chroot_linux-image diff --git a/helpers/lh_chroot_local-hooks b/helpers/chroot_local-hooks similarity index 100% rename from helpers/lh_chroot_local-hooks rename to helpers/chroot_local-hooks diff --git a/helpers/lh_chroot_local-includes b/helpers/chroot_local-includes similarity index 100% rename from helpers/lh_chroot_local-includes rename to helpers/chroot_local-includes diff --git a/helpers/lh_chroot_local-packages b/helpers/chroot_local-packages similarity index 100% rename from helpers/lh_chroot_local-packages rename to helpers/chroot_local-packages diff --git a/helpers/lh_chroot_local-packageslists b/helpers/chroot_local-packageslists similarity index 100% rename from helpers/lh_chroot_local-packageslists rename to helpers/chroot_local-packageslists diff --git a/helpers/lh_chroot_local-patches b/helpers/chroot_local-patches similarity index 100% rename from helpers/lh_chroot_local-patches rename to helpers/chroot_local-patches diff --git a/helpers/lh_chroot_local-preseed b/helpers/chroot_local-preseed similarity index 100% rename from helpers/lh_chroot_local-preseed rename to helpers/chroot_local-preseed diff --git a/helpers/lh_chroot_localization b/helpers/chroot_localization similarity index 100% rename from helpers/lh_chroot_localization rename to helpers/chroot_localization diff --git a/helpers/lh_chroot_packages b/helpers/chroot_packages similarity index 100% rename from helpers/lh_chroot_packages rename to helpers/chroot_packages diff --git a/helpers/lh_chroot_packageslists b/helpers/chroot_packageslists similarity index 100% rename from helpers/lh_chroot_packageslists rename to helpers/chroot_packageslists diff --git a/helpers/lh_chroot_preseed b/helpers/chroot_preseed similarity index 100% rename from helpers/lh_chroot_preseed rename to helpers/chroot_preseed diff --git a/helpers/lh_chroot_proc b/helpers/chroot_proc similarity index 100% rename from helpers/lh_chroot_proc rename to helpers/chroot_proc diff --git a/helpers/lh_chroot_resolv b/helpers/chroot_resolv similarity index 100% rename from helpers/lh_chroot_resolv rename to helpers/chroot_resolv diff --git a/helpers/lh_chroot_selinuxfs b/helpers/chroot_selinuxfs similarity index 100% rename from helpers/lh_chroot_selinuxfs rename to helpers/chroot_selinuxfs diff --git a/helpers/lh_chroot_sources b/helpers/chroot_sources similarity index 100% rename from helpers/lh_chroot_sources rename to helpers/chroot_sources diff --git a/helpers/lh_chroot_symlinks b/helpers/chroot_symlinks similarity index 100% rename from helpers/lh_chroot_symlinks rename to helpers/chroot_symlinks diff --git a/helpers/lh_chroot_sysfs b/helpers/chroot_sysfs similarity index 100% rename from helpers/lh_chroot_sysfs rename to helpers/chroot_sysfs diff --git a/helpers/lh_chroot_sysv-rc b/helpers/chroot_sysv-rc similarity index 100% rename from helpers/lh_chroot_sysv-rc rename to helpers/chroot_sysv-rc diff --git a/helpers/lh_chroot_sysvinit b/helpers/chroot_sysvinit similarity index 100% rename from helpers/lh_chroot_sysvinit rename to helpers/chroot_sysvinit diff --git a/helpers/lh_chroot_tasks b/helpers/chroot_tasks similarity index 100% rename from helpers/lh_chroot_tasks rename to helpers/chroot_tasks diff --git a/helpers/lh_clean b/helpers/clean similarity index 100% rename from helpers/lh_clean rename to helpers/clean diff --git a/helpers/lh_config b/helpers/config similarity index 100% rename from helpers/lh_config rename to helpers/config diff --git a/helpers/lh b/helpers/lh index c22f554d6..8ab9de2df 100755 --- a/helpers/lh +++ b/helpers/lh @@ -34,15 +34,15 @@ case "${1}" in COMMAND="${1}" shift - if [ -x "${LH_BASE}/helpers/lh_${COMMAND}" ] + if [ -x "${LH_BASE}/helpers/${COMMAND}" ] then - LH=1 exec "${LH_BASE}/helpers/lh_${COMMAND}" "${@}" - elif [ -x /usr/share/live-helper/helpers/lh_${COMMAND} ] + LH=1 exec "${LH_BASE}/helpers/${COMMAND}" "${@}" + elif [ -x /usr/share/live-helper/helpers/${COMMAND} ] then - LH=1 exec /usr/share/live-helper/helpers/lh_"${COMMAND}" "${@}" - elif [ -x "$(which lh_${COMMAND} 2>/dev/null)" ] + LH=1 exec /usr/share/live-helper/helpers/"${COMMAND}" "${@}" + elif [ -x "$(which ${COMMAND} 2>/dev/null)" ] then - LH=1 exec lh_"${COMMAND}" "${@}" + LH=1 exec "${COMMAND}" "${@}" else Echo_error "no such helper" exit 1 diff --git a/helpers/lh_local b/helpers/local similarity index 100% rename from helpers/lh_local rename to helpers/local diff --git a/helpers/lh_source b/helpers/source similarity index 100% rename from helpers/lh_source rename to helpers/source diff --git a/helpers/lh_source_debian b/helpers/source_debian similarity index 100% rename from helpers/lh_source_debian rename to helpers/source_debian diff --git a/helpers/lh_source_debian-live b/helpers/source_debian-live similarity index 100% rename from helpers/lh_source_debian-live rename to helpers/source_debian-live diff --git a/helpers/lh_source_disk b/helpers/source_disk similarity index 100% rename from helpers/lh_source_disk rename to helpers/source_disk diff --git a/helpers/lh_source_iso b/helpers/source_iso similarity index 100% rename from helpers/lh_source_iso rename to helpers/source_iso diff --git a/helpers/lh_source_md5sum b/helpers/source_md5sum similarity index 100% rename from helpers/lh_source_md5sum rename to helpers/source_md5sum diff --git a/helpers/lh_source_net b/helpers/source_net similarity index 100% rename from helpers/lh_source_net rename to helpers/source_net diff --git a/helpers/lh_source_tar b/helpers/source_tar similarity index 100% rename from helpers/lh_source_tar rename to helpers/source_tar diff --git a/helpers/lh_source_usb-hdd b/helpers/source_usb-hdd similarity index 100% rename from helpers/lh_source_usb-hdd rename to helpers/source_usb-hdd diff --git a/helpers/lh_source_virtual-hdd b/helpers/source_virtual-hdd similarity index 100% rename from helpers/lh_source_virtual-hdd rename to helpers/source_virtual-hdd diff --git a/helpers/lh_testroot b/helpers/testroot similarity index 100% rename from helpers/lh_testroot rename to helpers/testroot