Changeset 3d1b542

Timestamp:

06/23/2006 05:35:28 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

dd29d02

Parents:

a03a4aa

Message:

Removed duplicated VERSION declarations.

Files:

• common/common-functions (modified) (3 diffs)
• master.sh (modified) (1 diff)

common/common-functions

@@ -580 +580 @@
       else
         echo -ne "done\n"
-        # Set the canonical book version
-        cd $JHALFSDIR
-        VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@<!ENTITY version "@@;s@">@@'`
-         # Another work-around, clfs book has a x.x.x-date versioning system
-         if [ "$PROGNAME" = "clfs" ]; then
-           VERSION=${VERSION##*-}
-         fi
         extract_commands
       fi
@@ -595 +588 @@
       esac
       echo -ne "done\n"
-      # Set the canonical book version
-      cd $JHALFSDIR
-      VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@<!ENTITY version "@@;s@">@@'`
-      # Another work-around, clfs book has a x.x.x-date versioning system
-      if [ "$PROGNAME" = "clfs" ]; then
-        VERSION=${VERSION##*-}
-      fi
       extract_commands
     fi
   else
     echo -ne "Using $BOOK as book's sources ...\n"
-    # Set the canonical book version
-    cd $JHALFSDIR
-    VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@<!ENTITY version "@@;s@">@@'`
-    # Another work-around, clfs book has a x.x.x-date versioning system
-    if [ "$PROGNAME" = "clfs" ]; then
-      VERSION=${VERSION##*-}
-    fi
     extract_commands
   fi
@@ -627 +606 @@
   cd $JHALFSDIR
   VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@<!ENTITY version "@@;s@">@@'`
+  # Another work-around, clfs book has a x.x.x-date versioning system
+  if [ "$PROGNAME" = "clfs" ]; then
+    VERSION=${VERSION##*-}
+  fi
 
   # Start clean

master.sh

@@ -508 +508 @@
   #
   [[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
+  #
   cp $COMMON_DIR/packages.xsl  $JHALFSDIR/
   #