more unification

libisoburn/trunk/releng/inc/releng_getopts.inc

@@ -2,18 +2,43 @@ SELF=$(basename $0)
 RELENG_XORRISO=0
 KEEP=0
 SIMULATE_FAILURE=0
+CLEANUP=1
 
-usage() {
+START_DIR_DONT_CHANGE=`pwd`
+GEN_DATA_DIR=releng_generated_data/${SELF}
+
+#############################################
+print_help() {
 cat << EOF
 
 Usage: $SELF -x path/to/xorriso [-k0|1] [-f0|1] [-h]
        -x  absolute or relative path to binary to be run.
-       -k  keep selfgenerated data, values 0,1 default 0.
-       -f  simulate failure, values 0,1 default 0.
+       -k  keep selfgenerated data (values 0,1, default 0).
+       -c  cleanup selfgenerated data kept from previous
+           run and exit            (values 0,1, default 0).
+       -f  simulate failure        (values 0,1, default 0).
 EOF
 }
 
-while getopts “x:k:f:h” OPTION
+#############################################
+cleanup() {
+ if [ ${KEEP} -eq 0 -a ${CLEANUP} -eq 1 ]; then
+   # safety net, just in case -> we want to be in the starting
+   # directory before removing whatever self-generated stuff
+   if [ -d "${GEN_DATA_DIR}" ]; then
+       cd "${START_DIR_DONT_CHANGE}" || exit 2
+       rm -rf ${GEN_DATA_DIR}
+       printf "${SELF}: Removed (self-generated) %s\n" ${GEN_DATA_DIR}
+   else
+       printf "${SELF}: ${GEN_DATA_DIR} does not exist. Nothing to clean.\n"
+   fi
+ else
+   printf "${SELF}: Leaving (self-generated) %s\n" ${GEN_DATA_DIR}
+ fi 
+}
+
+#############################################
+while getopts “x:k:c:f:h” OPTION
 do
   case $OPTION in
        x)
@@ -22,34 +47,46 @@ do
        k)
          KEEP=$OPTARG
          ;;
+       c)
+         CLEANUP=$OPTARG
+	 cleanup
+	 exit 0
+         ;;
        f)
          SIMULATE_FAILURE=$OPTARG
          ;;
        h)
-         usage
+         print_help
          exit 0
          ;;
        *)
-         usage
+         print_help
          exit 31
          ;;
   esac
 done
 
-if [ ! -x $RELENG_XORRISO ]; then
- usage
- printf "\n${SELF}: -x  absolute or relative path to binary to be run.\n\n"
+# Each releng_ test should decide whether or not to check that
+#if [ ! -x $RELENG_XORRISO ]; then
+# print_help
+# printf "\n${SELF}: -x  absolute or relative path to binary to be run.\n\n"
+# exit 31
+#fi
+
+if [ x"$KEEP" != x"0" -a x"$KEEP" != x"1" ]; then
+ print_help
+ printf "\n${SELF}: -k  keep selfgenerated data.\n\n"
  exit 31
 fi
 
-if [ x"$KEEP" != x"0" -a x"$KEEP" != x"1" ]; then
- usage
- printf "\n${SELF}: -k  keep selfgenerated data, values 0,1 default 0.\n\n"
+if [ x"$CLEANUP" != x"0" -a x"$CLEANUP" != x"1" ]; then
+ print_help
+ printf "\n${SELF}: -c  cleanup selfgenerated data kept from previous run.\n\n"
  exit 31
 fi
 
 if [ x"$SIMULATE_FAILURE" != x"0" -a x"$SIMULATE_FAILURE" != x"1" ]; then
- usage
- printf "\n${SELF}: -f  simulate failure, values 0,1 default 0.\n\n"
+ print_help
+ printf "\n${SELF}: -f  simulate failure.\n\n"
  exit 31
 fi

libisoburn/trunk/releng/inc/test_releng_getopt

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