diff options
| author | Michael Larson <slioch@slioch.vyatta.com> | 2009-11-13 13:43:40 -0800 |
|---|---|---|
| committer | Michael Larson <slioch@slioch.vyatta.com> | 2009-11-13 13:43:40 -0800 |
| commit | bd04893b403c5979ecb6fa5d5f8b8aa215b19e82 (patch) | |
| tree | 4516f67e6f20304a77116bab03958c5cb4b9d0d0 /scripts/install/install-functions | |
| parent | 41e01b6cf6993d473ac251be251e5f7489081b17 (diff) | |
| parent | 3b5ccd729ad0236cfc0350035c294a4b0d395f51 (diff) | |
| download | vyatta-cfg-quagga-bd04893b403c5979ecb6fa5d5f8b8aa215b19e82.tar.gz vyatta-cfg-quagga-bd04893b403c5979ecb6fa5d5f8b8aa215b19e82.zip | |
dependency update
Merge branch 'kenwood' of http://git.vyatta.com/vyatta-cfg-system into kenwood
Conflicts:
debian/control
Diffstat (limited to 'scripts/install/install-functions')
| -rwxr-xr-x | scripts/install/install-functions | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 3bdc1fde..29707dff 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -43,18 +43,20 @@ VYATTA_CFG_DIR=${vyatta_sysconfdir}/config # the floppy config dir FD_CFG_DIR=/media/floppy/config -# Process ID for progress_indicator -SPID=$$ - +# PROGRESS_PID can be exported by top-level script progress_indicator () { + local spid=$PROGRESS_PID + if [ -z "$spid" ]; then + spid=$$ + fi case "$1" in start) - $vyatta_bindir/progress-indicator $SPID & + $vyatta_bindir/progress-indicator $spid & ;; *) - if ! rm /tmp/pi.$SPID 2>/dev/null; then + if ! rm /tmp/pi.$spid 2>/dev/null; then sleep 1 - rm /tmp/pi.$SPID 2>/dev/null + rm /tmp/pi.$spid 2>/dev/null fi sleep 1 echo -n -e "\b" |