Changeset 200fbde for jhalfs

Timestamp:

08/09/2017 01:51:40 PM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

506120ee

Parents:

340c27e

Message:

jhalfs: reorder actions: install lfs before custom tools
and blfs

File:

• jhalfs (modified) (6 diffs)

jhalfs

@@ -353 +353 @@
 if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then
 
-  # If requested, clean the build directory
+# If requested, clean the build directory
   clean_builddir
 
@@ -360 +360 @@
   fi
 
-  # Create $BUILDDIR/sources even though it could be created by get_sources()
+# Create $BUILDDIR/sources even though it could be created by get_sources()
   if [[ ! -d $BUILDDIR/sources ]]; then
     mkdir -p $BUILDDIR/sources
   fi
-  #
-  # Create the log directory
+
+# Create the log directory
   if [[ ! -d $LOGDIR ]]; then
     mkdir $LOGDIR
   fi
   >$LOGDIR/$LOG
-  #
-  # Copy common helper files
+
+# Copy common helper files
   cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
-  # Copy needed stylesheets
+
+# Copy needed stylesheets
   cp $COMMON_DIR/{packages.xsl,chroot.xsl} $JHALFSDIR/
-  #
-  # Fix the XSL book parser
+
+# Fix the XSL book parser
   case $PROGNAME in
     clfs* ) sed 's,FAKEDIR,'${BOOK}/BOOK',' ${PACKAGE_DIR}/${XSL} > $JHALFSDIR/${XSL} ;;
@@ -383 +384 @@
   esac
   export XSL=$JHALFSDIR/${XSL}
-  #
-
-  # Copy packageManager.xml, if needed
+
+# Copy packageManager.xml, if needed
   [[ "$PKGMNGT" = "y" ]] && [[ "$PROGNAME" = "lfs" ]] && {
     cp $PKGMNGTDIR/packageManager.xml  $JHALFSDIR/
     cp $PKGMNGTDIR/packInstall.sh  $JHALFSDIR/
     }
-  #
-  # Copy urls.xsl, if needed
+
+# Copy urls.xsl, if needed
   [[ "$GETPKG" = "y" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
-  #
-  # Create the test-log directory, if needed
+
+# Create the test-log directory, if needed
   [[ "$TEST" != "0" ]] && [[ ! -d $TESTLOGDIR ]] && install -d -m 1777 $TESTLOGDIR
-  #
-  # Create the installed-files directory, if needed
+
+# Create the installed-files directory, if needed
   [[ "$INSTALL_LOG" = "y" ]] && [[ ! -d $FILELOGDIR ]] && install -d -m 1777 $FILELOGDIR
-  #
-  # Prepare report creation, if needed
+
+# Prepare report creation, if needed
   if [[ "$REPORT" = "y" ]]; then
     cp $COMMON_DIR/create-sbu_du-report.sh  $JHALFSDIR/
@@ -407 +407 @@
     validate_config > $JHALFSDIR/jhalfs.config
   fi
-  #
-  # Copy optimize files, if needed
+
+# Copy optimize files, if needed
   [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/
-  #
-  # Copy compare files, if needed
+
+# Copy compare files, if needed
   if [[ "$COMPARE" = "y" ]]; then
     mkdir -p $JHALFSDIR/extras
     cp extras/* $JHALFSDIR/extras
   fi
-  #
-  # Copy custom tools config files, if requested
+
+# Download or updates the book source
+  get_book
+  extract_commands
+  echo "${SD_BORDER}${nl_}"
+  cd $CWD # the functions above change directory
+
+# Copy custom tools config files, if requested
   if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
     echo "Copying custom tool scripts to $JHALFSDIR"
@@ -423 +429 @@
     cp -f custom/config/* $JHALFSDIR/custom-commands
   fi
-  #
-  # Install blfs-tool, if requested.
+
+# Install blfs-tool, if requested.
   if [[ "${BLFS_TOOL}" = "y" ]] ; then
     echo Installing BLFS book and tools
@@ -430 +436 @@
     [[ ${PIPESTATUS[0]} != 0 ]] && exit 1
   fi
-  #
-
-# Download or updates the book source
-  get_book
-  extract_commands
-  echo "${SD_BORDER}${nl_}"
 
 fi