Changeset d44206f for common

Timestamp:

09/13/2006 08:30:00 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

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

Children:

6f75d64

Parents:

597d802

Message:

Applied Dan Nicholson's changes to progress_bar.sh and its support code

Location:

common

Files:

• common-functions (modified) (4 diffs)
• progress_bar.sh (modified) (2 diffs)

common/common-functions

@@ -45 +45 @@
 $i:  $PREV
         @\$(call echo_message, Building)
-        @./progress_bar.sh \$@ &
+        @./progress_bar.sh \$@ \$\$PPID &
         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >logs/$LOGFILE
 EOF
@@ -66 +66 @@
 $i:  $PREV
         @\$(call echo_message, Building)
-        @./progress_bar.sh \$@ &
+        @./progress_bar.sh \$@ \$\$PPID &
         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=${SCRIPT_ROOT}\`\n" >logs/$LOGFILE
 EOF
@@ -368 +368 @@
 $i:  $PREV
         @\$(call echo_message, Building)
-        @./progress_bar.sh \$@ &
+        @./progress_bar.sh \$@ \$\$PPID &
         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >logs/$LOGFILE
 EOF
@@ -388 +388 @@
 $i:  $PREV
         @\$(call echo_message, Building)
-        @./progress_bar.sh \$@ &
+        @./progress_bar.sh \$@ \$\$PPID &
         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=${SCRIPT_ROOT}\`\n" >logs/$LOGFILE
 EOF

common/progress_bar.sh

@@ -8 +8 @@
 [[ -z $1 ]] && exit
 TARGET=$1  # Remember the target build we are looking for
+MAKE_PPID=$2
 
 declare -r  CSI=$'\e['  # DEC terminology, Control Sequence Introducer
@@ -22 +23 @@
 declare -i  PREV_SEC=0
 
-makePID=$(fuser -v . 2>&1 | grep make)
-makePID=$(echo $makePID | cut -d" " -f2)
-
 write_or_exit() {
     # make has been killed or failed or run to completion, leave
-  [[ ! -e /proc/$makePID ]] && echo -n "${CURSOR_ON}" && exit
+  [[ ! -e /proc/${MAKE_PPID} ]] && echo -n "${CURSOR_ON}" && exit
 
     # Target build complete, leave.