Changeset 9199a13 for common

Timestamp:

06/10/2006 04:48:25 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

966cb20

Parents:

e35e794

Message:

Merged r2754:2768 from trunk.

Location:

common

Files:

• common-functions (modified) (3 diffs)
• func_compare.sh (modified) (2 diffs)
• makefile-functions (modified) (3 diffs)
• progress_bar.sh (modified) (1 diff)

common/common-functions

@@ -219 +219 @@
         [[ -n \$\$ROOT ]] && \\
         rm -rf \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\
-        if [ -e \$(MOUNT_PT)\$(SRC)/${PKG_NAME%%-*}-build ]; then \\
-                rm -rf \$(MOUNT_PT)\$(SRC)/${PKG_NAME%%-*}-build; \\
+        if [ -e \$(MOUNT_PT)\$(SRC)/${PKG_NAME%-*}-build ]; then \\
+                rm -rf \$(MOUNT_PT)\$(SRC)/${PKG_NAME%-*}-build; \\
         fi;
 EOF
@@ -236 +236 @@
         [[ -n \$\$ROOT ]] && \\
         rm -rf \$(SRC)/\$\$ROOT && \\
-        if [ -e \$(SRC)/${PKG_NAME%%-*}-build ]; then \\
-                rm -rf \$(SRC)/${PKG_NAME%%-*}-build; \\
+        if [ -e \$(SRC)/${PKG_NAME%-*}-build ]; then \\
+                rm -rf \$(SRC)/${PKG_NAME%-*}-build; \\
         fi;
 EOF
@@ -460 +460 @@
                 rm -r \$(SRC)/$name-build; \\
         fi;
+EOF
+) >> $MKFILE.tmp
+}
+
+
+#----------------------------------#
+wrt_touch() {                      #
+#----------------------------------#
+(
+cat << EOF
+        @touch  \$@ && \\
+        sleep .25 && \\
+        echo -e "\n\n "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+        echo --------------------------------------------------------------------------------\$(WHITE)
 EOF
 ) >> $MKFILE.tmp

common/func_compare.sh

@@ -102 +102 @@
 
 #----------------------------------#
-wrt_logs() {             #
+wrt_logs() {                       #
 #----------------------------------#
   local ITERATION=iteration-$1
@@ -112 +112 @@
         mv ${LOGS} $ITERATION && \\
         popd 1> /dev/null
-        @touch \$@
+        @touch \$@ && \\
+        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+        echo --------------------------------------------------------------------------------\$(WHITE)
 EOF
 ) >> $MKFILE.tmp

common/makefile-functions

@@ -13 +13 @@
   @echo --------------------------------------------------------------------------------
   @echo $(BOLD)$(1) target $(BLUE)$@$(BOLD)
-  @echo --------------------------------------------------------------------------------$(WHITE)
+  @echo $(WHITE)
 endef
 
@@ -57 +57 @@
   @echo -e \\texcept if building CLFS with METHOO=boot.
   @echo
-  @echo -e \\t- Set a password for the root user
+  @echo -e \\t- Set a password for the root user.
   @echo
   @echo -e \\t- Edit /etc/fstab, /etc/hosts, /etc/sysconfig/clock,
@@ -64 +64 @@
   @echo -e \\tany other configuration file required to suit your needs.
   @echo
-  @echo -e \\t- Set-up the boot loader. See the relevant book section.
+  @echo -e \\t- Exit from the chroot.
   @echo
-  @echo -e \\t- Unmount the filesystems.
+  @echo -e \\t- Set-up the boot loader, except if building CLFS with METHOO=boot.
+  @echo -e \\tYou can set-up the host bootloader or the new boot-loader
+  @echo -e \\tinstalled on the new system.
+  @echo -e \\tIf the last, you must to mount the virtual filesystems, re-enter
+  @echo -e \\tto the chroot and be sure that /dev is populated with the
+  @echo -e \\trequired devices before configure the boot-loader. When ready,
+  @echo -e \\texit from the chroot and umount the filesystems
   @echo
   @echo If you are an experienced LFS user, several of those steps can be

common/progress_bar.sh

@@ -5 +5 @@
 set -e
 
+# Be sure that we know the taget name
 [[ -z $1 ]] && exit
+TARGET=$1  # Remember the target build we are looking for
 
-if [ ! -f $1 ] ; then
-  while fuser -v . 2>&1 | grep make >/dev/null ; do
-    echo -n "."
-    sleep 1
-    [[ -f $1 ]] && exit
-  done
-fi
+declare -r  CSI=$'\e['  # DEC terminology, Control Sequence Introducer
+declare -r  CURSOR_OFF=${CSI}$'?25l'
+declare -r  CURSOR_ON=${CSI}$'?25h'
+declare -r  ERASE_LINE=${CSI}$'2K'
+declare -r  FRAME_OPEN=${CSI}$'2G['
+declare -r  FRAME_CLOSE=${CSI}$'63G]'
+declare -r  TS_POSITION=${CSI}$'65G'
+declare -a  RESET_LINE=${CURSOR_OFF}${ERASE_LINE}${FRAME_OPEN}${FRAME_CLOSE}
+
+declare -a  GRAPHIC_STR="| / - \\ + "
+declare -i  SEC=0  # Seconds accumulator
+declare -i  PREV_SEC=0
+
+
+write_or_exit() {
+    # make has been killed or failed or run to completion, leave
+  if ! fuser -v . 2>&1 | grep make >/dev/null ; then
+     echo -n "${CURSOR_ON}" && exit
+  fi
+    # Target build complete, leave.
+  [[ -f ${TARGET} ]] && echo -n "${CURSOR_ON}" && exit
+    # It is safe to write to the screen
+  echo -n "$1"
+}
+
+  # initialize screen
+write_or_exit "${RESET_LINE}${TS_POSITION}0 min. 0 sec. "
+
+  # loop forever..
+while true ; do
+
+      # Loop through the animation string
+    for GRAPHIC_CHAR in ${GRAPHIC_STR} ; do
+      write_or_exit "${CSI}$((SEC + 3))G${GRAPHIC_CHAR}"
+      sleep .12 # This value MUST be less than .2 seconds.
+    done
+
+      # A BASH internal variable, the number of seconds the script
+      # has been running. modulo convert to 0-59
+    SEC=$(($SECONDS % 60))
+
+      # Detect rollover of the seconds.
+    (( PREV_SEC > SEC )) && write_or_exit "${RESET_LINE}"
+    (( PREV_SEC = SEC ))
+
+      # Display the accumulated time. div minutes.. modulo seconds.
+    write_or_exit "${TS_POSITION}$(($SECONDS / 60)) min. $SEC sec. "
+done
+
+exit