Changeset a0f0bee for master.sh

Timestamp:

05/14/2006 11:35:23 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

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

Children:

0596057

Parents:

5a733a4

Message:

Do some housekeeping in ./master.sh

File:

• master.sh (modified) (6 diffs)

master.sh

@@ -447 +447 @@
 validate_config
 echo "${SD_BORDER}${nl_}"
-
 echo -n "Are you happy with these settings? yes/no (no): "
 read ANSWER
@@ -456 +455 @@
 echo "${nl_}${SD_BORDER}${nl_}"
 
-# Loadd additional modules or configuration files based on global settings
+# Load additional modules or configuration files based on global settings
 # compare module
 if [[ "$COMPARE" = "1" ]]; then
@@ -471 +470 @@
   [[ $? > 0 ]] && echo " optimize/optimize_functions did not load.." && exit
   [[ $VERBOSITY > 0 ]] && echo "OK"
-fi
-#
-# optimize configurations
-if [[ "$OPTIMIZE" != "0" ]]; then
+  #
+  # optimize configurations
   [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization config..."
   source optimize/opt_config
   [[ $? > 0 ]] && echo " optimize/opt_config did not load.." && exit
   [[ $VERBOSITY > 0 ]] && echo "OK"
-fi
-#
-
-# Validate optimize settings, if required
-[[ "$OPTIMIZE" != "0" ]] && validate_opt_settings
-
-# Prevents setting "-d /" by mistake.
-
-if [ $BUILDDIR = / ] ; then
-  echo -ne "\nThe root directory can't be used to build LFS.\n\n"
-  exit 1
-fi
+  # Validate optimize settings, if required
+  validate_opt_settings
+fi
+#
 
 # If $BUILDDIR has subdirectories like tools/ or bin/, stop the run
 # and notify the user about that.
-
 if [ -d $BUILDDIR/tools -o -d $BUILDDIR/bin ] && [ -z $CLEAN ] ; then
   eval "$no_empty_builddir"
@@ -505 +493 @@
   mkdir -p $JHALFSDIR
 fi
-
+#
+# 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
+if [[ ! -d $LOGDIR ]]; then
+  mkdir $LOGDIR
+fi
+>$LOGDIR/$LOG
+#
+#
 if [[ "$PWD" != "$JHALFSDIR" ]]; then
   cp $COMMON_DIR/makefile-functions $JHALFSDIR/
@@ -513 +513 @@
     cp extras/* $JHALFSDIR/extras
   fi
+  #
   if [[ -n "$FILES" ]]; then
     # pushd/popd necessary to deal with mulitiple files
@@ -519 +520 @@
     popd 1> /dev/null
   fi
+  #
   if [[ "$PROGNAME" != "blfs" ]]; then
-    [[ "$REPORT" = "1" ]] && cp $COMMON_DIR/create-sbu_du-report.sh  $JHALFSDIR/
+    if [[ "$REPORT" = "1" ]]; then
+      cp $COMMON_DIR/create-sbu_du-report.sh  $JHALFSDIR/
+      # After be sure that all look sane and if REPORT=1, dump the settings to a file
+      # This file will be used to create the REPORT header
+      validate_config > $JHALFSDIR/jhalfs.config
+    fi     
     [[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
   fi
+  #
   sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
   export XSL=$JHALFSDIR/${XSL}
 fi
 
-if [[ ! -d $LOGDIR ]]; then
-  mkdir $LOGDIR
-fi
-
-# After be sure that all look sane and if REPORT=1, dump the settings to a file
-# This file will be used to create the REPORT header
-[[ "$PROGNAME" != "blfs" ]] && [[ "$REPORT" = "1" ]] && validate_config > $JHALFSDIR/jhalfs.config
-
->$LOGDIR/$LOG
 
 get_book
 echo "${SD_BORDER}${nl_}"
 
-# If $BUILDDIR/sources hasn't been created yet at this point, create it.
-[[ ! -d $BUILDDIR/sources ]] && mkdir $BUILDDIR/sources
 
 build_Makefile