diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2009-11-02 18:31:18 -0800 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2009-11-02 18:31:18 -0800 |
| commit | 1b9a722a77305bfc607a5a34317fbc743d2ae4bb (patch) | |
| tree | 1a2dbccb40c30e6f151aeb6e139f62ad54e8c81a /scripts/install/install-functions | |
| parent | a6ead18568860f4a574325198ecfe188c69eda28 (diff) | |
| parent | 4b6feb5e30012862b6a91578914ef2194d242f31 (diff) | |
| download | vyatta-cfg-quagga-1b9a722a77305bfc607a5a34317fbc743d2ae4bb.tar.gz vyatta-cfg-quagga-1b9a722a77305bfc607a5a34317fbc743d2ae4bb.zip | |
Merge branch 'kenwood' of http://git.vyatta.com/vyatta-cfg-system into kenwood
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" |