diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2008-02-07 02:18:27 +0000 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2008-02-07 02:18:27 +0000 |
| commit | 74ebf6cd74ac1af778135f41ad1b181e89c80cd9 (patch) | |
| tree | 62f4819a94955febdaab6c9a1a856cfa4da496ac /gen_determineargs.sh | |
| parent | Change &>/dev/null to >/dev/null 2>&1 because busybox ash sucks (diff) | |
| download | genkernel-74ebf6cd74ac1af778135f41ad1b181e89c80cd9.tar.gz genkernel-74ebf6cd74ac1af778135f41ad1b181e89c80cd9.tar.bz2 genkernel-74ebf6cd74ac1af778135f41ad1b181e89c80cd9.zip | |
Fix two calls to set_config_with_override on CMD_KERNCACHE and some indentation weirdness
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@591 67a159dc-881f-0410-a524-ba9dfbe2cb84
Diffstat (limited to 'gen_determineargs.sh')
| -rw-r--r-- | gen_determineargs.sh | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 68b0ba0c..ac404125 100644 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -1,9 +1,9 @@ #!/bin/bash get_KV() { - if [ "${CMD_NO_KERNEL_SOURCES}" = '1' -a -e "${CMD_KERNCACHE}" ] + if [ "${NO_KERNEL_SOURCES}" = '1' -a -e "${KERNCACHE}" ] then - /bin/tar -xj -C ${TEMP} -f ${CMD_KERNCACHE} kerncache.config + /bin/tar -xj -C ${TEMP} -f ${KERNCACHE} kerncache.config if [ -e ${TEMP}/kerncache.config ] then KERN_24=0 @@ -72,7 +72,6 @@ determine_real_args() { set_config_with_override 2 DEBUGFILE CMD_DEBUGFILE set_config_with_override 2 KERNEL_DIR CMD_KERNEL_DIR "${DEFAULT_KERNEL_SOURCE}" set_config_with_override 1 NO_KERNEL_SOURCES CMD_NO_KERNEL_SOURCES - set_config_with_override 2 KERNCACHE CMD_KERNCACHE set_config_with_override 2 KNAME CMD_KERNNAME "genkernel" set_config_with_override 2 MAKEOPTS CMD_MAKEOPTS "$DEFAULT_MAKEOPTS" @@ -158,26 +157,26 @@ determine_real_args() { if [ "${NO_KERNEL_SOURCES}" != "1" ] then if [ ! -d ${KERNEL_DIR} ] - then + then gen_die "kernel source directory \"${KERNEL_DIR}\" was not found!" - fi + fi fi if [ -z "${KERNCACHE}" ] then if [ "${KERNEL_DIR}" = '' -a "${NO_KERNEL_SOURCES}" != "1" ] - then + then gen_die 'No kernel source directory!' - fi + fi if [ ! -e "${KERNEL_DIR}" -a "${NO_KERNEL_SOURCES}" != "1" ] - then + then gen_die 'No kernel source directory!' - fi + fi else if [ "${KERNEL_DIR}" = '' ] then gen_die 'Kernel Cache specified but no kernel tree to verify against!' - fi + fi fi # Special case: If --no-clean is specified on the command line, @@ -185,9 +184,9 @@ determine_real_args() { if [ "${CMD_CLEAN}" != '' ] then if ! isTrue ${CLEAN} - then + then MRPROPER=0 - fi + fi fi if [ -n "${MINKERNPACKAGE}" ] |