drop KEEP variable, since it is inverted CLEANUP

This commit is contained in:
George Danchev 2011-07-15 18:22:09 +00:00
parent 6bce4510d7
commit 2a5daec056
2 changed files with 3 additions and 8 deletions

View File

@ -4,9 +4,8 @@
SELF=$(basename $0) SELF=$(basename $0)
RELENG_XORRISO=0 RELENG_XORRISO=0
KEEP=0
SIMULATE_FAILURE=0 SIMULATE_FAILURE=0
CLEANUP=0 CLEANUP=1
RELENG_PRINTED_HELP=0 RELENG_PRINTED_HELP=0
START_DIR_DONT_CHANGE=`pwd` START_DIR_DONT_CHANGE=`pwd`
@ -37,8 +36,7 @@ unboldify() {
############################################# #############################################
cleanup() { cleanup() {
# if [ ${KEEP} -eq 0 -a ${CLEANUP} -eq 1 ]; then if [ ${CLEANUP} -eq 1 ]; then
if [ ${KEEP} -eq 0 ]; then
# safety net, just in case -> we want to be in the starting # safety net, just in case -> we want to be in the starting
# directory before removing whatever self-generated stuff # directory before removing whatever self-generated stuff
if [ -d "${GEN_DATA_DIR}" ]; then if [ -d "${GEN_DATA_DIR}" ]; then
@ -135,7 +133,7 @@ do
next_is="x" next_is="x"
elif test x"$i" = x"-k" elif test x"$i" = x"-k"
then then
KEEP=1 CLEANUP=0
elif test x"$i" = x"-c" elif test x"$i" = x"-c"
then then
CLEANUP=1 CLEANUP=1
@ -167,5 +165,3 @@ then
print_help print_help
exit 31 exit 31
fi fi

View File

@ -5,7 +5,6 @@ set -e
. releng_getopts.inc . releng_getopts.inc
printf "\nRELENG_XORRISO =${RELENG_XORRISO}" printf "\nRELENG_XORRISO =${RELENG_XORRISO}"
printf "\nKEEP =${KEEP}"
printf "\nCLEANUP =${CLEANUP}" printf "\nCLEANUP =${CLEANUP}"
printf "\nSIMULATE_FAILURE =${SIMULATE_FAILURE}" printf "\nSIMULATE_FAILURE =${SIMULATE_FAILURE}"
printf "\n" printf "\n"