WebSVN – duke3d_hrp – Path Comparison – / – /tools/hrp_extract.sh Rev 709 and /tools/hrp

Regard whitespace Rev 709 → Rev 710

 /tools/hrp_extract.bash/hrp_extract.sh
 ,29 → 1,44
 #!/bin/bash
-# Duke Nukem 3D High Resolution Pack Extractor  v0.8.0  2019-05-07
+# Duke Nukem 3D CON/DEF/HRP File Extractor  v0.9.0  2019-05-27
 #
 # Author: LeoD
-# License: ISC license : https://opensource.org/licenses/isc-license.txt
+# License: ISC License -> https://opensource.org/licenses/isc-license.txt
 #
 # This script extracts a working copy of your local Duke Nukem 3D High
 # Resolution Pack's Subversion repository, ready for zipping and distribution.
 # This is mostly done by hierarchically parsing the *.def files.
 # PolyMER or PolyMOST only versions can be chosen.
-# On Windows you might want MSYS' zip to create package files.
-# ("mingw-get install msys-zip")
-# MinGW/MSYS performance is horrible, better go Linux. Even my virtual Debian
-# machine accessing the Windows drive is 5 to 10 times faster.
-# But it still sucks. This needs to become a Perl script one day.
-# Or maybe MSYS' bash gets finally updated to 4.* and I'll use its regex engine.
+#
+# On Windows you may use the Bash shell that comes with either MSYS2 or Git.
+# Bash's performance of calling executables is horrible, better go Linux. Even
+# my virtual Debian machine accessing the Windows drive is several times faster.
+# As of v0.9.0, Bash's builtin regex engine is used for many parts, but it fails
+# to use the \b word delimiter correctly on Windows ( v4.4.23, x86_64-pc-msys ).
 DEF_TOP=UNDEFINED
+CON_TOP=UNDEFINED
+GRP_TOP=UNDEFINED
+GRP=""
 SET_VERSION=YES            # [YES|NO]
 EXTRACT_COMMENTED_FILES=NO # [YES|NO]
 DUKEPLUS_POLYMOST_COMPATIBILTY_APPROACH=polymost  #[none|polymost|polymer|mixed]
 ATTRITION_POLYMOST_COMPATIBILTY_APPROACH=polymost #[none|polymost|polymer|mixed]
-ask()
-{
+exit_on_error() {
+  echo -e "\e[0;31mERROR   :\e[0m ${@}"
+  exit 1
+}
+warning() {
+  echo -e "\e[1;35mWARNING :\e[0m ${@}"
+}
+info() {
+  echo -e "\e[0;32mINFO    :\e[0m ${@}"
+}
+ask() {
   echo -n "$@" '[y/N] ' ; read ans
   case "$ans" in
     y*|Y*) return 0 ;;
 ,28 → 47,27
 } # ask
-copy_folders()
-{
-  mkdir ${EXTRACTDIR}
-  for HRPDIR in . ; do
-    if [ -d "${HRPDIR}" ] ; then
-      DIRLIST=./HRP_DIRECTORIES.lst
-      find "${HRPDIR}" -type d | grep -v ".\svn" > ${DIRLIST}
+copy_folders() {
+  mkdir ${EXTRACTDIR} || exit_on_error "Could not create ${EXTRACTDIR}/"
+  for SUBDIR in . ; do
+    if [ -d "${SUBDIR}" ] ; then
+      DIRLIST=${EXTRACTDIR}/DIRECTORIES.lst
+      find  "${SUBDIR}" -type d | grep -v "\.svn" > ${DIRLIST}
       cat ${DIRLIST} | while read DIR; do
         if [ ! -d "${EXTRACTDIR}/${DIR}" ] ; then
-          mkdir "${EXTRACTDIR}/${DIR}"
+          mkdir   "${EXTRACTDIR}/${DIR}" || exit_on_error\
+            "Could not create ${EXTRACTDIR}/${DIR}/"
         fi
       done
       rm     ${DIRLIST}
     else
-      echo "${HRPDIR} : no HRP."
+      exit_on_error "${SUBDIR} : Oops."
     fi
   done
 } # copy_folders()
-copy_set_version()
-{
+copy_set_version() {
   VER_FILE="$1"
   TARGET_FILE="$2"
   if [ ! "${SET_VERSION}" = "YES" ] ; then
 ,7 → 81,7
       fi
     fi
-    echo "copy_set_version ${VER_FILE} -> ${TARGET_FILE}"
+    echo "copy_set_version: ${VER_FILE} -> ${TARGET_FILE}"
     case "${VER_FILE}" in
       hrp_readme.txt)
 ,26 → 103,25
       duke3d_hrp_polymost.def | \
       tools/polymost_override/duke3d_hrp_polymost_override.def | \
       duke3d_hrp_megaton.def | \
-      tools/megaton_override/duke3d_hrp_megaton_override.def )
+      tools/megaton_override/duke3d_hrp_megaton_override.def | \
+      duke3d_maphacks.def )
         cat "${VER_FILE}" | sed -r --posix \
           s/\(Version\ *\)\([0-9\.]*\)\(.*\)/\\1${VERSION}\\3/ \
           >> "${TARGET_FILE}"
         ;;
       *)
-        echo "###ERROR: copy_set_version() - BAD FILE: ${VER_FILE}"
-        exit 1
+        exit_on_error "copy_set_version() - UNKNOWN FILE: ${VER_FILE}"
         ;;
     esac
   fi
 } # copy_set_version()
-tar_copy_dir()
-{
+tar_copy_dir() {
   (cd ${1}; tar cf - . ) | (cd ${2}; tar xf -)
 }
-copy_known_files()
-{
+copy_known_files() {
   if [ -f  hrp_readme.txt ] ; then
     copy_set_version hrp_readme.txt "${EXTRACTDIR}/hrp_readme.txt"
   fi
 ,7 → 134,8
   fi
   if [ "${HRPTYPE}" = "polymost" ] || [ "${HRPTYPE}" = "polymer" ] ||\
-     [ "${HRPTYPE}" = "maphacks" ] || [ "${HRPTYPE}" = "full" ] ; then
+     [ "${HRPTYPE}" = "maphacks" ] || [ "${HRPTYPE}" = "full" ] ||\
+     [ "${HRPTYPE}" = "voxels" ] ; then
     cp -pv maphacks/MapHacks.txt    "${EXTRACTDIR}/maphacks/"
   fi
 ,10 → 183,10
     cp -pvr tools/megaton_override/dukedc* "${EXTRACTDIR}"
     cp -pvr tools/megaton_override/highres "${EXTRACTDIR}"
     # Let Megaton Override work on top of Polymost HRP:
-    cp -pv highres/screen_megaton.def          "${EXTRACTDIR}/highres/"
-    cp -pv highres/screen/menu_megaton.def     "${EXTRACTDIR}/highres/"
-    cp -pv highres/sprites_megaton.def         "${EXTRACTDIR}/highres/"
-    cp -pv highres/sprites/effects_megaton.def "${EXTRACTDIR}/highres/sprites/"
+    #cp -pv highres/screen_megaton.def          "${EXTRACTDIR}/highres/"
+    #cp -pv highres/screen/menu_megaton.def     "${EXTRACTDIR}/highres/screen/"
+    #cp -pv highres/sprites_megaton.def         "${EXTRACTDIR}/highres/"
+    #cp -pv highres/sprites/effects_megaton.def "${EXTRACTDIR}/highres/sprites/"
   fi
   if [ "${HRPTYPE}" = "polymost" ] || [ "${HRPTYPE}" = "megaton" ] ; then
 ,11 → 227,11
     cp -pv           maphacks/MapHacks.txt          "${EXTRACTDIR}"
     cp -pv           maphacks/mhk-extract.def       "${EXTRACTDIR}/maphacks/"
     cp -pv           maphacks/maphacks_polymost.def "${EXTRACTDIR}/maphacks/"
-    cp -pv           duke3d_maphacks_standalone.def "${EXTRACTDIR}"
-    copy_set_version duke3d_maphacks_standalone.def "${EXTRACTDIR}/duke3d.def"
+    cp -pv           duke3d_maphacks.def            "${EXTRACTDIR}"
+    copy_set_version duke3d_maphacks.def            "${EXTRACTDIR}/duke3d.def"
   fi
-  if [ "${HRPTYPE}" = "voxel" ] ; then
+  if [ "${HRPTYPE}" = "voxels" ] ; then
     cp -pv voxelpack_readme.txt      "${EXTRACTDIR}"
     cp -pv voxelpack_art_license.txt "${EXTRACTDIR}"
     cp -pv duke3d.def                "${EXTRACTDIR}"
 ,6 → 238,9
     cp -pv duke3d_voxels.def         "${EXTRACTDIR}"
     if [ -f  EDUKE.CON ] ; then
       cp -pv EDUKE.CON               "${EXTRACTDIR}"
+      #cp -pv scripts/animation.con   "${EXTRACTDIR}/scripts/"
+      #cp -pv scripts/rotation.con    "${EXTRACTDIR}/scripts/"
+      cp -pv scripts/*.con           "${EXTRACTDIR}/scripts/"
     fi
   fi
 ,37 → 250,37
     cp -pv HRP.bat                  "${EXTRACTDIR}"
     cp -pv HRP_Readme.txt           "${EXTRACTDIR}"
     cp -pv HRP_Changes.txt          "${EXTRACTDIR}"
-    echo "Copying skyboxes ..."
+    info "Copying  skyboxes ..."
     tar_copy_dir "highres/skyboxes" "${EXTRACTDIR}/highres/skyboxes"
     cd "${WORKDIR}"
   fi
   if [ "${HRPTYPE}" = "sw_lowres" ] ; then
-    echo "Creating sw.def for lowres HRP ..."
+    info "Creating sw.def for lowres HRP ..."
     echo "include lowres/sw_lrp.def" > "${EXTRACTDIR}/sw.def"
     cp -pv lowres/sw_lrp.def           "${EXTRACTDIR}/lowres/"
     cp -pv LRP.bat                     "${EXTRACTDIR}"
     cp -pv LRP_Readme.txt              "${EXTRACTDIR}"
     cp -pv LRP_Changes.txt             "${EXTRACTDIR}"
-    echo "Copying skyboxes ..."
+    info "Copying  skyboxes ..."
     tar_copy_dir "highres/skyboxes"    "${EXTRACTDIR}/highres/skyboxes"
     cd "${WORKDIR}"
   fi
-  if [ "${HRPTYPE}" = "default" ] ; then
-    cp -pv  "${DEF_TOP}"          "${EXTRACTDIR}/${DEF_TOP}"
-    echo            "\`*.txt' -> \`${EXTRACTDIR}/*.txt'"
-    cp -p  *.txt                  "${EXTRACTDIR}"
+  if [ "${HRPTYPE}" = "auto" ] ; then
+    for txtfile in *.txt; do
+      cp -pv "$txtfile" "${EXTRACTDIR}"
+    done
   fi
 } # copy_known_files()
-copy_polymost_mhk()
-{
+copy_polymost_mhk() {
   cp -p maphacks/3drealms/E?L*_polymost.mhk "${EXTRACTDIR}"
   cp -p maphacks/dukedc/DUKEDC*-megaton.mhk "${EXTRACTDIR}"
   rm -f "${EXTRACTDIR}"/*_13d_*.mhk
+  rm -f "${EXTRACTDIR}"/*_worldtour_*.mhk
   # bashism:
   for i in "${EXTRACTDIR}"/*_polymost.mhk ; do mv "$i" "${i/_polymost}" ; done
   for i in "${EXTRACTDIR}"/*-megaton.mhk  ; do mv "$i" "${i/-megaton}"  ; done
 ,7 → 327,7
   case "$PATCHTYPE" in
     polymer)
-      echo "  # (Using \"Polymer approach\")"
+      echo "          (Using \"Polymer approach\")"
       cp -pi $SPR/firstperson/2510_devastator.md3            "$SPRE/firstperson/"
       cp -pi $SPR/firstperson/2510_devastator.png            "$SPRE/firstperson/"
       cp -pi $SPR/firstperson/2510_devastator_s.png          "$SPRE/firstperson/"
 ,7 → 344,7
       cp -pi $SPR/firstperson/duke_hand_s.png                "$SPRE/firstperson/"
       ;;
     polymost)
-      echo "  # (Using \"Polymost approach\")"
+      echo "          (Using \"Polymost approach\")"
       #cp -pi $SPR/firstperson_polymost/2510_devastator.md3   "$SPRE/firstperson/"
       #cp -pi $SPR/firstperson_polymost/2510_devastator.png   "$SPRE/firstperson/"
       ##cp -pi $SPR/firstperson/2510_devastator_s.png          "$SPRE/firstperson/"
 ,15 → 361,15
       #cp -pi $SPR/firstperson/duke_hand_s.png                "$SPRE/firstperson/"
       ;;
     mixed)
-      echo "  # (Using \"Mixed approach\")"
-      echo "    # Not applied / Not yet implemented"
+      echo "          (Using \"Mixed approach\")"
+      echo "          Not applied / Not yet implemented"
       ;;
     none)
-      echo "  Not applied"
+      info "  Not applied"
       #echo "  # Not yet implemented"
       ;;
     *)
-      echo "  # Bad parameter"
+      warning "  Bad parameter"
       ;;
   esac
 ,8 → 376,7
 } # dukeplus_polymost_hrp_compatibility()
-attrition_polymost_hrp_compatibility()
-{
+attrition_polymost_hrp_compatibility() {
   # attr_hrp.def expects some files to be present in the HRP
   #
   # model "highres/sprites/firstperson/2524_pistol.md3" {    // most/mer : same MD3 + same skin til r295
 ,10 → 389,10
   case "$PATCHTYPE" in
     polymer)
-      echo "  # (Using \"Polymer approach\")"
+      echo "          (Using \"Polymer approach\")"
       ;;
     polymost)
-      echo "  # (Using \"Polymost approach\")"
+      echo "          (Using \"Polymost approach\")"
       cp -piu $SPR/firstperson_polymost/2524_pistol.md3      "$SPRE/firstperson/"
       cp -pi  $SPR/firstperson_polymost/2524_pistol.png      "$SPRE/firstperson/"
       cp -pi  $SPR/firstperson_polymost/2524_pistol_g.png    "$SPRE/firstperson/"
 ,7 → 402,7
       #cp -pi  $SPR/firstperson/duke_hand_d.png               "$SPRE/firstperson/2532_cliphand.png"
       ;;
     mixed)
-      echo "  # (Using \"Mixed approach\")"
+      echo "          (Using \"Mixed approach\")"
       cp -piu $SPR/firstperson_polymost/2524_pistol.md3       "$SPRE/firstperson/"
       cp -pi  $SPR/firstperson_polymost/2524_pistol.png       "$SPRE/firstperson/"
       cp -pi  $SPR/firstperson_polymost/2524_pistol_g.png     "$SPRE/firstperson/"
 ,11 → 421,11
       cp -pi  highres/common/transp.png                      "${EXTRACTDIR}/highres/common"
       ;;
     none)
-      echo "  Not applied"
+      info "  Not applied"
       #echo "  # Not yet implemented"
       ;;
     *)
-      echo "  # Bad parameter"
+      warning "  Bad parameter"
       ;;
   esac
 ,65 → 432,100
 } # attrition_polymost_hrp_compatibility()
-parse_defs()
-{
-  echo "$1"
-  BLOCK_COMMENT="OFF"
-  cat $1 | while read DEF_LINE; do
+extract_file() {
+  local FILE="$1"
+  if [ -f "${FILE}" ] ; then
+    cp -p "${FILE}" "${EXTRACTDIR}/${FILE}"
+  elif [ ${GRP} ] ; then
+    cd "${EXTRACTDIR}/${GRP}"
+      kextract "${WORKDIR}/${GRP}" "${FILE}" > /dev/null
+    cd "${WORKDIR}"
+    if [ ! -f "${EXTRACTDIR}/${GRP}/${FILE}" ] ; then
+      warning "${FILE} is missing!"
+    #else
+    #  echo -e "${FILE} -> \e[0;33m${GRP}/\e[0m${FILE^^}"
+    fi
+  else
+    warning "${FILE} is missing!"
+  fi
+}
-    #DOS only: DEF_FILE=`echo "${DEF_LINE}" | grep -wE "^include" | sed s/include\ //`
-    #DEF_FILE=`echo "${DEF_LINE}" | grep -wE "^include" | sed s/include\ // | sed s/\\\r//`
-#    DEF_FILE=`echo "${DEF_LINE}" | grep -wE "^include" | sed s/include\ // | sed s/\\\/\\\/.*// | sed s/\\\r//`
-    DEF_FILE=`echo "${DEF_LINE}" | grep -wE "^include" | awk '{ print $2 }' | sed 's/\r//'`
-    if [ "${DEF_FILE}" != "" ] ; then
-      cp -p      "${DEF_FILE}" "${EXTRACTDIR}/${DEF_FILE}"
-      parse_defs "${DEF_FILE}"
+parse_defs() {
+  local DEF_FILE="$1"
+  extract_file "${DEF_FILE}"
+  if [ -f "${DEF_FILE}" ] ; then
+    echo  "${DEF_FILE}"
+  elif [  -f "${EXTRACTDIR}/${GRP}/${DEF_FILE}" ] ; then
+    echo   -e "${DEF_FILE} -> \e[0;33m${GRP}/\e[0m${DEF_FILE^^}"
+    DEF_FILE="${EXTRACTDIR}/${GRP}/${DEF_FILE^^}"
+  else
+    return
     fi
-    #HRP_TERM=`echo "${DEF_LINE}" | grep -owE "file|model|voxel|front|right|back|left|top|bottom|down"`
+  BLOCK_COMMENT="OFF"
+  cat "${DEF_FILE}" | while read DEF_LINE; do
+    #echo "DEF_LINE1: ${DEF_LINE}"
+    #DEF_TERM=`echo "${DEF_LINE}" | grep -owE "file|model|voxel|front|right|back|left|top|bottom|down"`
     ## Old style added (except "defineskybox"):
-    HRP_TERM=`echo "${DEF_LINE}" | grep -owE "definetexture|definemodel|definemodelskin|file|mhkfile|model|voxel|front|right|back|left|top|bottom|down"`
+    #DEF_TERM=`echo "${DEF_LINE}" | grep -owE "include|definetexture|definemodel|definemodelskin|file|mhkfile|model|voxel|front|right|back|left|top|bottom|down|\\/\\*|\\*\\/"`
     #More skybox tokens: tile, pal, ft|rt|bk|lf|up|dn|forward|lt|ceiling|floor|ceil
+    #echo "DEF_TERM1: ${DEF_TERM}"
-    if [ ! "$EXTRACT_COMMENTED_FILES" = "YES" ] ; then
+    local TOKEN_LIST='\b(include\b'
+    local TOKEN_LIST='^(include)'
+    local TOKEN_LIST='(^include|file|^definetexture|^definemodel|^definemodelskin|^mhkfile|^model|^voxel|^front|^right|^back|^left|^top|^bottom|^down|\/\*|\*\/)'
-      COMMENT_TERM=`echo "${DEF_LINE}" | grep -oE "\\/\\*|\\*\\/"`
+    if [[ ${DEF_LINE} =~ ${TOKEN_LIST} ]] ; then
+      DEF_TERM="${BASH_REMATCH}"
+    else
+      DEF_TERM=""
+    fi
+    if [ "${DEF_TERM}" ] && [ "$EXTRACT_COMMENTED_FILES" = "NO" ] ; then
+      #COMMENT_TERM=`echo "${DEF_LINE}" | grep -oE "\\/\\*|\\*\\/"`
+      COMMENT_TERM="${DEF_TERM}"
       if [ "$COMMENT_TERM"  = "/*" ] ; then BLOCK_COMMENT="ON" ; fi
-      if [ "$BLOCK_COMMENT" = "ON" ] ; then HRP_TERM="" ; fi
+      if [ "$BLOCK_COMMENT" = "ON" ] ; then DEF_TERM="" ; fi
       if [ "$COMMENT_TERM"  = "*/" ] ; then BLOCK_COMMENT="OFF" ; fi
-      if [ ! "$HRP_TERM" = "" ] ; then
-        HRP_COMMENT=`echo "${DEF_LINE}" | grep -E "//.*$HRP_TERM"`
-        if [ ! "$HRP_COMMENT" = "" ] ; then
-          HRP_TERM=""
+      if [ $DEF_TERM ] ; then
+        if [[ ${DEF_LINE} =~ //.*$DEF_TERM ]] ; then
+          DEF_TERM=""
         fi
       fi
+    fi
+    if [ "${DEF_TERM}" ] ; then case "$DEF_TERM" in
+      include)
+        local SUB_DEF_FILE=`echo "${DEF_LINE}" | grep -wE "^include" | awk '{ print $2 }' | sed 's/\r//'`
+        if [          ${SUB_DEF_FILE} ] ; then
+          parse_defs "${SUB_DEF_FILE}"
     fi
-    case "$HRP_TERM" in
-      file|mhkfile)
-        #HRP_FILE=`echo "${DEF_LINE}" | sed -r s/^.*file\ *\"//g | sed s/\".*//`
-        # Mastering the backslash :-) ... hm, no big performance gain ... :
-        HRP_FILE=`echo "${DEF_LINE}" | sed -r --posix s/\\(^.*file\\ *\"\\)\\([^\"]*\\)\\(.*\\)/\\\2/`
-        # Ignore comments WIP:
-        #HRP_FILE=`echo "${DEF_LINE}" | sed -r --posix s/\\(^.*file\\ *\\)\\(\\"\\(.*\\)\\"\\)\\(.*\\)/\\\3/`
         ;;
-      model|voxel)
-        HRP_FILE=`echo "${DEF_LINE}" | sed -r --posix s/\\(^.*${HRP_TERM}\\ *\"\\)\\([^\"]*\\)\\(.*\\)/\\\2/`
+      file)
+        if [[ ${DEF_LINE} =~ \ file\  ]] ; then
+          HRP_FILE=`echo "${DEF_LINE}" | sed -r --posix s/\\(^.*${DEF_TERM}\\ *\"\\)\\([^\"]*\\)\\(.*\\)/\\\2/`
+        elif [[ ! ${DEF_LINE} =~ mapfile ]] ; then
+          warning "Bad 'file' statement: ${DEF_LINE}"
+        fi
         ;;
+      mhkfile|model|voxel)
+        HRP_FILE=`echo "${DEF_LINE}" | sed -r --posix s/\\(^.*${DEF_TERM}\\ *\"\\)\\([^\"]*\\)\\(.*\\)/\\\2/`
+        ;;
       front|right|back|left|top|bottom|down)
-        #HRP_FILE=`echo "${DEF_LINE}" | sed -r s/^.*${HRP_TERM}\ *\"//g | sed s/\".*//`
-        HRP_FILE=`echo "${DEF_LINE}" | sed -r --posix s/\\(^.*${HRP_TERM}\\ *\"\\)\\([^\"]*\\)\\(.*\\)/\\\2/`
+        HRP_FILE=`echo "${DEF_LINE}" | sed -r --posix s/\\(^.*${DEF_TERM}\\ *\"\\)\\([^\"]*\\)\\(.*\\)/\\\2/`
         ;;
       ## Old Style
       definemodel)
-        HRP_FILE=`echo "${DEF_LINE}" | sed -r --posix s/\\(^.*${HRP_TERM}\\ *\"\\)\\([^\"]*\\)\\(.*\\)/\\\2/`
+        HRP_FILE=`echo "${DEF_LINE}" | sed -r --posix s/\\(^.*${DEF_TERM}\\ *\"\\)\\([^\"]*\\)\\(.*\\)/\\\2/`
         ;;
       definemodelskin)
-        HRP_FILE=`echo "${DEF_LINE}" | sed -r --posix s/\\(^.*${HRP_TERM}\\ 0\\ \"\\)\\([^\"]*\\)\\(.*\\)/\\\2/`
+        HRP_FILE=`echo "${DEF_LINE}" | sed -r --posix s/\\(^.*${DEF_TERM}\\ 0\\ \"\\)\\([^\"]*\\)\\(.*\\)/\\\2/`
         ;;
       definetexture)
         # Won't work atm if filename in quotes (too lazy)
 ,22 → 537,134
       *)
         HRP_FILE=""
         ;;
-    esac
+    esac ; fi
-    if [  !   "${HRP_FILE}" = "" ] ; then
-      if [ -f "${HRP_FILE}" ] ; then
-        cp -p "${HRP_FILE}" "${EXTRACTDIR}/${HRP_FILE}"
+    if [ "${HRP_FILE}" ] ; then
+      extract_file "${HRP_FILE}"
+    fi
+  done
+} # parse_defs()
+parse_cons() {
+  local CON_FILE="$1"
+  extract_file "${CON_FILE}"
+  if [ -f "${CON_FILE}" ] ; then
+    echo  "${CON_FILE}"
+  elif [  -f "${EXTRACTDIR}/${GRP}/${CON_FILE}" ] ; then
+    echo   -e "${CON_FILE} -> \e[0;33m${GRP}/\e[0m${CON_FILE^^}"
+    CON_FILE="${EXTRACTDIR}/${GRP}/${CON_FILE^^}"
       else
-        echo  "WARNING : ${HRP_FILE} is missing!"
+    return
       fi
+  MUSIC_FLAG=""
+  MUSIC_POS=""
+  BLOCK_COMMENT="OFF"
+  cat "${CON_FILE}" | while read CON_LINE; do
+    #echo "CON_LINE : ${CON_LINE}"
+    #CON_TERM=`echo "${CON_LINE}" | grep -owE "include|setdefname|definelevelname|definesound|music|\\/\\*|\\*\\/"`
+    #echo "CON_TERM : ${CON_TERM}"
+    #if [[ ${CON_LINE} =~ include|setdefname|definelevelname|definesound|music|\/\*|\*\/ ]] ; then
+    local TOKEN_LIST='\b(include\b'
+    local TOKEN_LIST='^(include)'
+    local TOKEN_LIST='(include|setdefname|definelevelname|definesound|music|\/\*|\*\/)'
+    if [[ ${CON_LINE} =~ ${TOKEN_LIST} ]] ; then
+      #echo "Rematch  : ${BASH_REMATCH}"
+      CON_TERM="${BASH_REMATCH}"
+    else
+      CON_TERM=""
     fi
+    if [ ${MUSIC_FLAG} ] && [ "${CON_TERM}" = "" ] ; then
+      MUSIC_POS="1"
+          MUSIC_FLAG=""
+    else
+      MUSIC_POS=""
+    fi
+    if [ "${CON_TERM}" ] && [ "$EXTRACT_COMMENTED_FILES" = "NO" ] ; then
+      COMMENT_TERM="${CON_TERM}"
+      if [ "$COMMENT_TERM"  = "/*" ] ; then BLOCK_COMMENT="ON"  ; fi
+      if [ "$BLOCK_COMMENT" = "ON" ] ; then CON_TERM=""         ; fi
+      if [ "$COMMENT_TERM"  = "*/" ] ; then BLOCK_COMMENT="OFF" ; fi
+      if [ $CON_TERM ] ; then
+        if [[ ${CON_LINE} =~ //.*$CON_TERM ]] ; then
+          CON_TERM=""
+        fi
+      fi
+    fi
+    if [ "${CON_TERM}" ] ; then case "$CON_TERM" in
+      include)
+        local SUB_CON_FILE=`echo "${CON_LINE}" | grep -wE "$CON_TERM" | awk '{ print $2 }' | sed 's/\r//'`
+        if [          ${SUB_CON_FILE} ] ; then
+          parse_cons "${SUB_CON_FILE}"
+        fi
+        ;;
+      setdefname)
+        local     DEF_FILE=`echo "${CON_LINE}" | grep -wE "$CON_TERM" | awk '{ print $2 }' | sed 's/\r//'`
+        if [       ${DEF_FILE} ] ; then
+          DEF_TOP="${DEF_FILE}"
+          info "Toplevel DEF set to ${DEF_TOP}"
+          echo "${DEF_TOP}"  >   "${EXTRACTDIR}/DEF_TOP.tmp"
+        fi
+        ;;
+      definesound)
+        SOUND_FILE=`echo "${CON_LINE}" | grep -wE "$CON_TERM" | awk '{ print $3 }' | sed 's/\r//'`
+        if [            ${SOUND_FILE} ] ; then
+          extract_file "${SOUND_FILE}"
+        fi
+        ;;
+      definelevelname)
+          MAP_FILE=`echo "${CON_LINE}" | grep -wE "$CON_TERM" | awk '{ print $4 }' | sed 's/\r//'`
+        if [            ${MAP_FILE} ] ; then
+          extract_file "${MAP_FILE}"
+        fi
+        ;;
+      music)
+        MUSIC_POS=3
+        while [ ${MUSIC_POS} ] ; do
+          MUSIC_FILE=`echo "${CON_LINE}" | grep -wE "$CON_TERM" | awk "{ print \\$$MUSIC_POS }" | sed 's/\r//'`
+          if [            ${MUSIC_FILE} ] ; then
+            extract_file "${MUSIC_FILE}"
+            MUSIC_POS=$(($MUSIC_POS + 1))
+            MUSIC_FLAG=true
+          else
+            MUSIC_POS=""
+          fi
   done
-} # parse_defs()
+        ;;
+      *)
+        ;;
+    esac ; fi
+    if [ ${MUSIC_POS} ] ; then
+      while [ ${MUSIC_POS} ] ; do
+        MUSIC_FILE=`echo "${CON_LINE}" | grep -wE ".*\\.mid" | awk "{ print \\$$MUSIC_POS }" | sed 's/\r//'`
+        if [            ${MUSIC_FILE} ] ; then
+          extract_file "${MUSIC_FILE}"
+          MUSIC_POS=$(($MUSIC_POS + 1))
+          MUSIC_FLAG=true
+        else
+          MUSIC_POS=""
+        fi
+      done
+    fi
-delete_empty_folders()
-{
+  done
+} # parse_cons()
+delete_empty_folders() {
     if [ -d "${EXTRACTDIR}" ] ; then
       rm -rf ${EXTRACTDIR}/.svn
       DIRLIST=./EXTRACT_DIRECTORIES.lst
 ,14 → 679,18
       done
       rm ${DIRLIST}
     else
-      echo "No ${EXTRACTDIR}."
+    warning "No ${EXTRACTDIR}."
     fi
 } # delete_empty_folders()
-main()
-{
-  EXTRACTDIR=../hrp_${HRPTYPE}_extract
+main() {
+  EXTRACTDIR=../${HRPTYPE}_extract
+  [[ ${HRPTYPE} =~ (.*)(/)(.*) ]] # greedy first .* required
+  if [ ${BASH_REMATCH[3]} ] ; then
+    EXTRACTDIR=../${BASH_REMATCH[3]}_extract
+  fi
   echo  "EXTRACT :" ${HRPROOT}/${EXTRACTDIR}
   if [ $FORCE = 0 ] ; then
 ,21 → 700,21
     fi
   fi
-  date +%F" "%H:%M:%S
+  #date +%F" "%H:%M:%S
-  echo "### Deleting ${EXTRACTDIR} ... ###"
+  info "Deleting ${EXTRACTDIR} ..."
   rm -rf ${EXTRACTDIR}
-  echo "### Copying directory tree ... ###"
+  info "Copying  directory tree ..."
   copy_folders
   if [ "${HRPTYPE}" = "polymost" ] || [ "${HRPTYPE}" = "polymost_override" ] ||\
     [ "${HRPTYPE}" = "megaton" ] || [ "${HRPTYPE}" = "megaton_override" ] ; then
-    echo "### DukePlus<>Polymost HRP compatibility patch ... ###"
+    info "DukePlus<>Polymost HRP compatibility patch ..."
     dukeplus_polymost_hrp_compatibility $DUKEPLUS_POLYMOST_COMPATIBILTY_APPROACH
-    echo "### Attrition<>Polymost HRP compatibility patch ... ###"
+    info "Attrition<>Polymost HRP compatibility patch ..."
     attrition_polymost_hrp_compatibility $ATTRITION_POLYMOST_COMPATIBILTY_APPROACH
   fi
 ,16 → 726,13
   fi
   if [ "${HRPTYPE}" = "megaton" ] || [ "${HRPTYPE}" = "megaton_override" ]; then
-    echo "### Copying maphacks for Megaton ... ###"
+    info "Copying  maphacks for Megaton ..."
     copy_polymost_mhk
   fi
-  echo "### Parsing DEF file hierarchy ... ###"
-  if [ "$EXTRACT_COMMENTED_FILES" = "YES" ] ; then
-    echo "  # Extract commented textures and models: $EXTRACT_COMMENTED_FILES"
-  else
-    echo "  # Extract commented textures and models: NO"
-  fi
+  info "Extract  commented items - $EXTRACT_COMMENTED_FILES"
+  info "Parsing  file hierarchy :"
   if [ "${HRPTYPE}" = "megaton" ]  || [ "${HRPTYPE}" = "full" ] ; then
     parse_defs duke3d_hrp_megaton.def
   fi
 ,8 → 742,9
   if [ "${HRPTYPE}" = "polymer" ]  || [ "${HRPTYPE}" = "full" ] ; then
     parse_defs duke3d_hrp.def
   fi
-  if [ "${HRPTYPE}" = "voxel" ] ; then
-    parse_defs duke3d_voxel.def
+  #if [ "${HRPTYPE}" = "voxels" ]   || [ "${HRPTYPE}" = "full" ] ; then
+  if [ "${HRPTYPE}" = "voxels" ] ; then
+    parse_defs duke3d_voxels.def
   fi
   if [ "${HRPTYPE}" = "sw_highres" ] ; then
     parse_defs highres/sw_hrp.def
 ,21 → 755,105
   if [ "${HRPTYPE}" = "maphacks" ] ; then
     parse_defs maphacks/mhk-extract.def
   fi
-  if [ "${HRPTYPE}" = "default" ] ; then
+  if [ "${HRPTYPE}" = "${DEF_TOP}" ] ; then
     parse_defs "${DEF_TOP}"
   fi
+  if [ "${HRPTYPE}" = "${CON_TOP}" ] ; then
+    parse_cons "${CON_TOP}"
+    if [ -f        "${EXTRACTDIR}/DEF_TOP.tmp" ] ; then
+      DEF_TOP=`cat "${EXTRACTDIR}/DEF_TOP.tmp"`
+      rm           "${EXTRACTDIR}/DEF_TOP.tmp"
+      if [ -f      "${DEF_TOP}" ] ; then
+        cp -p      "${DEF_TOP}" "${EXTRACTDIR}/${DEF_TOP}"
+        parse_defs "${DEF_TOP}"
+      else
+        warning "${DEF_TOP} is missing!"
+      fi
+    fi
+  fi
+  if [ "${HRPTYPE}" = "${GRP_TOP}" ] ; then
+    GRP="${GRP_TOP}"
+    #parse_grp "${GRP}"
+    if hash kextract 2>/dev/null; then
+      #echo "kextract ${GRP} : "
+      #kextract "${GRP}" | wc -l
+      #kextract "${GRP}" > "${EXTRACTDIR}/${GRP}.lst"
+      mkdir    "${EXTRACTDIR}/${GRP}" || exit_on_error\
+        "Could not create ${EXTRACTDIR}/${GRP}"
+      cd       "${EXTRACTDIR}/${GRP}"
+      kextract "${WORKDIR}/${GRP}" "GAME.CON"  > /dev/null
+      kextract "${WORKDIR}/${GRP}" "EDUKE.CON" > /dev/null
+      cd "${WORKDIR}"
+      if [ -f    "${EXTRACTDIR}/${GRP}/EDUKE.CON" ] ; then
+        CON_FILE="EDUKE.CON"
+        rm -f    "${EXTRACTDIR}/${GRP}/GAME.CON"
+      elif [ -f  "${EXTRACTDIR}/${GRP}/GAME.CON" ] ; then
+        CON_FILE="GAME.CON"
+      else
+        exit_on_error "No EDUKE.CON or GAME.CON in ${GRP}!"
+      fi
+      parse_cons "${CON_FILE}"
-  echo "### Copying 'known' files ... ###"
+    else
+      exit_on_error "No 'kextract' executable found."
+    fi
+  fi
+  if [ "${HRPTYPE}" = "auto" ] ; then
+    if [ -f "duke3d.grp" ] ; then GRP="duke3d.grp" ; fi
+    if [ -f "DUKE3D.GRP" ] ; then GRP="DUKE3D.GRP" ; fi
+    if [ ${GRP} ] ; then
+      info "Auto mode found ${GRP}"
+      if hash kextract 2>/dev/null; then
+        mkdir "${EXTRACTDIR}/${GRP}"
+      else
+        info "No 'kextract' executable found."
+        GRP=""
+      fi
+    fi
+    if [     -f "EDUKE.CON" ] || [ -f "GAME.CON" ] ; then
+      if [   -f "EDUKE.CON" ] ; then
+        CON_TOP="EDUKE.CON"
+      else
+        CON_TOP="GAME.CON"
+      fi
+      info "Auto mode found ${CON_TOP}"
+      parse_cons "${CON_TOP}"
+      if [ -f        "${EXTRACTDIR}/DEF_TOP.tmp" ] ; then
+        DEF_TOP=`cat "${EXTRACTDIR}/DEF_TOP.tmp"`
+        rm           "${EXTRACTDIR}/DEF_TOP.tmp"
+        if [ -f      "${DEF_TOP}" ] ; then
+          cp -p      "${DEF_TOP}" "${EXTRACTDIR}/${DEF_TOP}"
+          parse_defs "${DEF_TOP}"
+        else
+          warning "${DEF_TOP} is missing!"
+        fi
+      elif [ -f "duke3d.def" ] ; then
+        DEF_TOP="duke3d.def"
+        info "Auto mode found ${DEF_TOP}"
+        parse_defs "${DEF_TOP}"
+      fi
+    elif [ -f "duke3d.def" ] ; then
+      DEF_TOP="duke3d.def"
+      info "Auto mode found ${DEF_TOP}"
+      parse_defs "${DEF_TOP}"
+    else
+      exit_on_error "Please report to LeoD"
+    fi
+  fi
+  info "Copying  'known' files ..."
   copy_known_files
-  echo "### Deleting empty directories in ${EXTRACTDIR} ... ###"
+  info "Deleting empty directories in ${EXTRACTDIR}/ ..."
   delete_empty_folders
-  date +%F" "%H:%M:%S
+  #date +%F" "%H:%M:%S
-  echo "Command line example for creating a ZIP package:"
-  echo "sh -c \"cd ${EXTRACTDIR}; zip -9rqn .jpg:.png:.zip ${EXTRACTDIR}.zip\
-  highpal highres maphacks *.def *.txt\""
+  #echo "Command line example for creating a ZIP package:"
+  #echo "sh -c \"cd ${EXTRACTDIR}; zip -9rqn .jpg:.png:.zip ${EXTRACTDIR}.zip\
+  #highpal highres maphacks *.def *.txt\""
 } # main()
 ,7 → 863,7
 if [ "$2" = "y" ] ; then FORCE=1 ; else FORCE=0 ; fi
 if [ "$2" = "v" ] && [ ! "$3" = "" ] ; then
   VERSION="$3"
-  echo "${VERSION}" > VERSION
+  info "${VERSION}" > VERSION
 fi
 HRPROOT=.
 WORKDIR=`pwd`
 ,7 → 907,7
     ${PRGPATH} maphacks y
     ${PRGPATH} full     y
     ;;
-  voxel)
+  voxels)
     SET_VERSION=NO
     main $HRPTYPE
     ;;
 ,25 → 923,42
     ${PRGPATH} sw_lowres  y
     ${PRGPATH} sw_highres y
     ;;
+  auto)
+    SET_VERSION=NO
+    EXTRACT_COMMENTED_FILES=NO
+    if [ -f "EDUKE.CON" ] || [ -f "GAME.CON" ] || [ -f "duke3d.def" ] ; then
+      main $HRPTYPE
+    else
+      exit_on_error "Auto mode found no suitable toplevel file (EDUKE.CON|GAME.CON|duke3d.def)."
+    fi
+    ;;
   unused)
-    echo "Option \"$1\" not yet implemented."
+    exit_on_error "Option \"$1\" not yet implemented."
     ;;
   debug)
-    echo "Nothing to debug."
+    exit_on_error "Nothing to debug."
     ;;
   *)
-    if [ -f "${HRPTYPE}" ] && [ "${HRPTYPE##*.}" = "def" ] ; then
-      DEF_TOP="${HRPTYPE}"
-      HRPTYPE=default
+    if [ -f "${HRPTYPE}" ] ; then
       SET_VERSION=NO
       EXTRACT_COMMENTED_FILES=NO
+      #EXTRACT_COMMENTED_FILES=YES
+      if [      "${HRPTYPE##*.}" = "def" ] ; then
+        DEF_TOP="${HRPTYPE}"
+      elif [    "${HRPTYPE##*.}" = "CON" ] || [ "${HRPTYPE##*.}" = "con" ]; then
+        CON_TOP="${HRPTYPE}"
+      elif [    "${HRPTYPE##*.}" = "GRP" ] || [ "${HRPTYPE##*.}" = "grp" ]; then
+        GRP_TOP="${HRPTYPE}"
+      else
+        exit_on_error "Bad file type: ${HRPTYPE##*.}."
+      fi
       main $HRPTYPE
     else
-      echo "Usage: ${0} {HRPTYPE|TOP_DEF_FILE} [v VERSION]"
+      echo "Usage   : ${0} {auto|TOP_CON_FILE|TOP_DEF_FILE|GRP_FILE|HRPTYPE [v VERSION]}"
       echo "HRPTYPEs: {full|ovr|all}"
       echo "HRPTYPEs: {polymer|polymost_override|polymost|both}"
       echo "HRPTYPEs: {megaton_override|megaton}"
-      echo "HRPTYPEs: {maphacks}"
+      echo "HRPTYPEs: {maphacks|voxels}"
       echo "HRPTYPEs: {sw_highres|sw_lowres|sw_both}"
       exit 1
     fi

Subversion Repositories duke3d_hrp

Compare Revisions

Regard whitespace Rev 709 → Rev 710