diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-06-14 17:35:11 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:35 +0100 |
| commit | 243ee8a6d3cfdcfaa3aa73b7a301f5973fcb2a6a (patch) | |
| tree | 738b31033c508b05a6b99cea4ea80e89f4ee3ad3 /helpers/lh_binary_debian-installer | |
| parent | 85493ae3b22028a4d17a06d4b893f21cf74a959b (diff) | |
| download | vyos-live-build-243ee8a6d3cfdcfaa3aa73b7a301f5973fcb2a6a.tar.gz vyos-live-build-243ee8a6d3cfdcfaa3aa73b7a301f5973fcb2a6a.zip | |
Replace a few unweildy "if" statements with their "case" equivalents
Diffstat (limited to 'helpers/lh_binary_debian-installer')
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 97ed2106d..2182a2bf5 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -173,16 +173,17 @@ DESTDIR_GI="${DESTDIR}/gtk" # Workaround for syslinux (<< 3.36) which doesn't support long file/path names if [ "${LH_DISTRIBUTION}" = "etch" ] then - if [ "${LH_BINARY_IMAGES}" = "tar" ] || [ "${LH_BINARY_IMAGES}" = "usb-hdd" ] - then - VMLINUZ_DI="vmlinuz.di" - INITRD_DI="initrddi.gz" - DESTDIR_DI="${DESTDIR}" - - VMLINUZ_GI="vmlinuz.gi" - INITRD_GI="initrdgi.gz" - DESTDIR_GI="${DESTDIR}" - fi + case "${LH_BINARY_IMAGES}" in + usb-hdd|tar) + VMLINUZ_DI="vmlinuz.di" + INITRD_DI="initrddi.gz" + DESTDIR_DI="${DESTDIR}" + + VMLINUZ_GI="vmlinuz.gi" + INITRD_GI="initrdgi.gz" + DESTDIR_GI="${DESTDIR}" + ;; + esac fi if [ "${LH_DEBIAN_INSTALLER_DAILY}" = "enabled" ] @@ -252,12 +253,13 @@ wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE}/${ wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz # Downloading graphical-installer -if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ] -then - mkdir -p "${DESTDIR_GI}" - wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL} - wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz -fi +case "${LH_ARCHITECTURE}" in + amd64|i386|powerpc) + mkdir -p "${DESTDIR_GI}" + wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL} + wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz + ;; +esac # Only download additional packages if appropriate if [ "${DI_IMAGE_TYPE}" != "netboot" ] |