r2803 - in jhalfs/trunk: . common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Jun 23 10:35:28 PDT 2006


Author: manuel
Date: 2006-06-23 11:35:28 -0600 (Fri, 23 Jun 2006)
New Revision: 2803

Modified:
   jhalfs/trunk/common/common-functions
   jhalfs/trunk/master.sh
Log:
Removed duplicated VERSION declarations.

Modified: jhalfs/trunk/common/common-functions
===================================================================
--- jhalfs/trunk/common/common-functions	2006-06-22 19:55:36 UTC (rev 2802)
+++ jhalfs/trunk/common/common-functions	2006-06-23 17:35:28 UTC (rev 2803)
@@ -579,13 +579,6 @@
         get_sources
       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
     else
@@ -594,24 +587,10 @@
            svn co $SVN/${svn_root}/trunk/BOOK ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 ;;
       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
 }
@@ -626,6 +605,10 @@
 
   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
   if [ -d ${PROGNAME}-commands ]; then

Modified: jhalfs/trunk/master.sh
===================================================================
--- jhalfs/trunk/master.sh	2006-06-22 19:55:36 UTC (rev 2802)
+++ jhalfs/trunk/master.sh	2006-06-23 17:35:28 UTC (rev 2803)
@@ -507,6 +507,7 @@
   fi
   #
   [[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
+  #
   cp $COMMON_DIR/packages.xsl  $JHALFSDIR/
   #
   sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}




More information about the alfs-log mailing list