diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-08-04 15:36:19 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-08-04 15:36:19 +0000 |
| commit | 006841001339d7ed83d054d3fa59ade0e117a511 (patch) | |
| tree | ed2e6d41ed6df691b99131354838a0822c53c78c | |
| parent | 10f90d03725810281511adfbbe1ae84f60885307 (diff) | |
Make it formally bashism.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4452 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | xpp/utils/xpp_fxloader | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/xpp/utils/xpp_fxloader b/xpp/utils/xpp_fxloader index 5a26560..925ee97 100644 --- a/xpp/utils/xpp_fxloader +++ b/xpp/utils/xpp_fxloader @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # xpp_fxloader: load Xorcom Astribank (XPP) firmware # @@ -56,8 +56,6 @@ me=`basename $0` DEBIAN_DEFAULTS="/etc/default/zaptel" REDHAT_DEFAULTS="/etc/sysconfig/zaptel" -status_fd=3 - if [ -r "$DEBIAN_DEFAULTS" -a -r "$REDHAT_DEFAULTS" ]; then echo 1>&2 "$0: Both '$DEBIAN_DEFAULTS' and '$REDHAT_DEFAULTS' exist" exit 1 @@ -145,12 +143,9 @@ load_fpga() { $LOGGER "FPGA Firmware into $dev" sleep_if_race - ( - $FPGA_LOAD -D "$dev" -I "$FIRMWARE_DIR/$fw" -i - echo $? >$status_fd - )>| $LOGGER - status=`cat <$status_fd` - if [ "$status" != 0 ]; then + $FPGA_LOAD -D "$dev" -I "$FIRMWARE_DIR/$fw" -i | $LOGGER + status=$PIPESTATUS + if [ $status != 0 ]; then echo "fpga_load failed with status $status" | $LOGGER exit 77 fi |