From d7fd007786c223394672d739089cc39ddd416755 Mon Sep 17 00:00:00 2001
From: George Danchev <danchev@spnet.net>
Date: Fri, 8 Jul 2011 13:05:21 +0000
Subject: [PATCH] unification cont.

---
 .../trunk/releng/inc/releng_getopts.inc       |   1 +
 libisoburn/trunk/releng/releng_isocontent     |   9 +
 libisoburn/trunk/releng/releng_isojigdo       | 169 ++++++++++--------
 libisoburn/trunk/releng/template_new_releng   |   9 +
 4 files changed, 112 insertions(+), 76 deletions(-)

diff --git a/libisoburn/trunk/releng/inc/releng_getopts.inc b/libisoburn/trunk/releng/inc/releng_getopts.inc
index c76b2b8e..45c67aaf 100644
--- a/libisoburn/trunk/releng/inc/releng_getopts.inc
+++ b/libisoburn/trunk/releng/inc/releng_getopts.inc
@@ -27,6 +27,7 @@ cleanup() {
    # directory before removing whatever self-generated stuff
    if [ -d "${GEN_DATA_DIR}" ]; then
        cd "${START_DIR_DONT_CHANGE}" || exit 2
+       chmod +w -R ${GEN_DATA_DIR}
        rm -rf ${GEN_DATA_DIR}
        printf "${SELF}: Removed (self-generated) %s\n" ${GEN_DATA_DIR}
    else
diff --git a/libisoburn/trunk/releng/releng_isocontent b/libisoburn/trunk/releng/releng_isocontent
index 47af304d..69b9f5b7 100755
--- a/libisoburn/trunk/releng/releng_isocontent
+++ b/libisoburn/trunk/releng/releng_isocontent
@@ -12,6 +12,15 @@ if [ ! -x $RELENG_XORRISO ]; then
  exit 31
 fi
 
+# check data dir, if any and after checking -x xorriso
+#if [ -d "${GEN_DATA_DIR}" ]; then
+# printf "\n${SELF}: directory %s exists!" ${GEN_DATA_DIR}
+# printf "\n${SELF}: use '${SELF} -c1' to remove.\n"
+# exit 8
+#else
+# mkdir "${GEN_DATA_DIR}"
+#fi
+
 export prog=${SELF}
 export xorriso=${RELENG_XORRISO}
 export workdir=${GEN_DATA_DIR}
diff --git a/libisoburn/trunk/releng/releng_isojigdo b/libisoburn/trunk/releng/releng_isojigdo
index 1ec98e61..d7744272 100755
--- a/libisoburn/trunk/releng/releng_isojigdo
+++ b/libisoburn/trunk/releng/releng_isojigdo
@@ -2,101 +2,118 @@
 
 set -e
 
-START_DIR_DONT_CHANGE=`pwd`
-SELF=$(basename "$0")
-
+# START_DIR_DONT_CHANGE=`pwd`
+# SELF=$(basename "$0")
 # required config items
-CONFFILE=$HOME/.libburnia-releng/${SELF}.conf
-GEN_DATA_DIR=releng_generated_data/${SELF}
+#CONFFILE=$HOME/.libburnia-releng/${SELF}.conf
+#GEN_DATA_DIR=releng_generated_data/${SELF}
+
+. inc/releng_getopts.inc
+
+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
+
+# check data dir, if any and after checking -x xorriso
+if [ -d "${GEN_DATA_DIR}" ]; then
+ printf "\n${SELF}: directory %s exists!" ${GEN_DATA_DIR}
+ printf "\n${SELF}: use '${SELF} -c1' to remove.\n"
+ exit 8
+else
+ mkdir "${GEN_DATA_DIR}"
+fi
+
 TMP_DATA_DIR=releng_generated_data
 IMG_EXTRACT_DIR=${GEN_DATA_DIR}/${SELF}_extracted_tree
 
 # to be set by the config file
-RELENG_XORRISO=""
+# RELENG_XORRISO=""
 
 RELENG_DIR="${IMG_EXTRACT_DIR}"
 RELENG_ISOLINUX_BIN="isolinux/isolinux.bin"
 RELENG_BOOT_CAT="isolinux/boot.cat"
 RELENG_IMG=t1
 
-KEEP=0
+# KEEP=0
 RES=""
 
 REMOTE_URL="http://cdimage.debian.org/cdimage/daily-builds/daily/current/i386/iso-cd"
 REMOTE_IMG="debian-testing-i386-businesscard.iso"
 
 #####
-print_help() {
- cat << HLP
-Usage:
- ${SELF} -help
-
+#print_help() {
+# cat << HLP
+#Usage:
+# ${SELF} -help
+#
 # using a config file ${CONFFILE}
- ${SELF} -rc [-keep]
-
+# ${SELF} -rc [-keep]
+#
 # without using a config file
- ${SELF} /absolute/or/relative/path/to/xorriso [-keep]
+# ${SELF} /absolute/or/relative/path/to/xorriso [-keep]
 
 # cleanup test generated data directory and exit
- ${SELF} -cleanup
-HLP
-}
+# ${SELF} -cleanup
+#HLP
+#}
 
 #####
-cleanup() {
- if [ ${KEEP} -eq 0 ]; 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 15
-       chmod +w -R ${GEN_DATA_DIR}
-       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 
-}
+#cleanup() {
+# if [ ${KEEP} -eq 0 ]; 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 15
+#       chmod +w -R ${GEN_DATA_DIR}
+#       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 
+#}
 
 # cleanup
-if [ "${1}" == "-cleanup" ]; then
- cleanup
- exit 0
-fi
+#if [ "${1}" == "-cleanup" ]; then
+# cleanup
+# exit 0
+#fi
 
 # help
-if [ ! "${1}" ]; then
- print_help && exit 3
+#if [ ! "${1}" ]; then
+# print_help && exit 3
 # config file
-elif [ "${1}" == "-rc" -a "${2}" == "-keep" ]; then
- KEEP=1
- if [ -e ${CONFFILE} ]; then
-  . ${CONFFILE}
-  printf "${SELF}: Using config file %s\n" ${CONFFILE}
- else
-  echo -e "\n${SELF}: Config file ${CONFFILE} not found.\n" && exit 4
- fi
-elif [ "${1}" == "-rc" -a ! "${2}" ]; then
- KEEP=0
- if [ -e ${CONFFILE} ]; then
-  . ${CONFFILE}
-  printf "${SELF}: Using config file %s\n" ${CONFFILE}
- else
-  echo -e "\n${SELF}: Config file ${CONFFILE} not found.\n" && exit 4
- fi
+#elif [ "${1}" == "-rc" -a "${2}" == "-keep" ]; then
+# KEEP=1
+# if [ -e ${CONFFILE} ]; then
+#  . ${CONFFILE}
+#  printf "${SELF}: Using config file %s\n" ${CONFFILE}
+# else
+#  echo -e "\n${SELF}: Config file ${CONFFILE} not found.\n" && exit 4
+# fi
+#elif [ "${1}" == "-rc" -a ! "${2}" ]; then
+# KEEP=0
+# if [ -e ${CONFFILE} ]; then
+#  . ${CONFFILE}
+#  printf "${SELF}: Using config file %s\n" ${CONFFILE}
+# else
+#  echo -e "\n${SELF}: Config file ${CONFFILE} not found.\n" && exit 4
+# fi
 # cmdline option
-elif [ -x "${1}" -a "${2}" == "-keep" ]; then
- RELENG_XORRISO="${1}"
- KEEP=1
-elif [ -x "${1}" ]; then
- RELENG_XORRISO="${1}"
- KEEP=0
+#elif [ -x "${1}" -a "${2}" == "-keep" ]; then
+# RELENG_XORRISO="${1}"
+# KEEP=1
+#elif [ -x "${1}" ]; then
+# RELENG_XORRISO="${1}"
+# KEEP=0
 # the rest
-else
- print_help && exit 5
-fi
+#else
+# print_help && exit 5
+#fi
 
 #
 if [ "${RELENG_XORRISO}" == "" -o "${RELENG_DIR}" == "" -o "${RELENG_IMG}" == "" ]; then
@@ -104,19 +121,19 @@ if [ "${RELENG_XORRISO}" == "" -o "${RELENG_DIR}" == "" -o "${RELENG_IMG}" == ""
  exit 6
 fi
 
-if [ ! -x "${RELENG_XORRISO}" ]; then
- printf "${SELF}: $RELENG_XORRISO not found or not an executable.\n"
- exit 7
-fi
+#if [ ! -x "${RELENG_XORRISO}" ]; then
+# printf "${SELF}: $RELENG_XORRISO not found or not an executable.\n"
+# exit 7
+#fi
 
 # data dir
-if [ -d "${GEN_DATA_DIR}" ]; then
- printf "\n${SELF}: directory %s exists!" ${GEN_DATA_DIR}
- printf "\n${SELF}: use '${SELF} -cleanup' to remove.\n"
- exit 8
-else
- mkdir "${GEN_DATA_DIR}"
-fi
+#if [ -d "${GEN_DATA_DIR}" ]; then
+# printf "\n${SELF}: directory %s exists!" ${GEN_DATA_DIR}
+# printf "\n${SELF}: use '${SELF} -cleanup' to remove.\n"
+# exit 8
+#else
+# mkdir "${GEN_DATA_DIR}"
+#fi
 
 # All must be set at this point
 printf "${SELF}: Config items:"
diff --git a/libisoburn/trunk/releng/template_new_releng b/libisoburn/trunk/releng/template_new_releng
index def19520..ea373f18 100755
--- a/libisoburn/trunk/releng/template_new_releng
+++ b/libisoburn/trunk/releng/template_new_releng
@@ -11,6 +11,15 @@ if [ ! -x $RELENG_XORRISO ]; then
  exit 31
 fi
 
+# check data dir, if any and after checking -x xorriso
+if [ -d "${GEN_DATA_DIR}" ]; then
+ printf "\n${SELF}: directory %s exists!" ${GEN_DATA_DIR}
+ printf "\n${SELF}: use '${SELF} -c1' to remove.\n"
+ exit 8
+else
+ mkdir "${GEN_DATA_DIR}"
+fi
+
 printf "\n$0: FAIL: === TEPLATE === RENAME ME TO releng_<title>\n"
 exit 31