--- a/testing/sisyphus/bin/build.sh
+++ b/testing/sisyphus/bin/build.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/

--- a/testing/sisyphus/bin/builder.sh
+++ b/testing/sisyphus/bin/builder.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/

--- a/testing/sisyphus/bin/check-spider.sh
+++ b/testing/sisyphus/bin/check-spider.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/

--- a/testing/sisyphus/bin/checkout.sh
+++ b/testing/sisyphus/bin/checkout.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/

--- a/testing/sisyphus/bin/clean.sh
+++ b/testing/sisyphus/bin/clean.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/

--- a/testing/sisyphus/bin/create-directory.sh
+++ b/testing/sisyphus/bin/create-directory.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/
@@ -62,17 +62,17 @@ The safety measures include refusing to 
 root and by refusing to create directories unless there are 
 a subdirectory of /tmp or have at least two ancestor 
 directories... /grandparent/parent/child.
 
 ******************** WARNING ********************
 This script will destroy existing directories and
 their contents. It can potentially wipe out your
 disk. Use with caution.
-    ******************** WARNING ********************
+******************** WARNING ********************
 
 EOF
     exit 1
 }
 
 unset directory
 
 rmopt="-i"

--- a/testing/sisyphus/bin/create-profile.sh
+++ b/testing/sisyphus/bin/create-profile.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/

--- a/testing/sisyphus/bin/download.sh
+++ b/testing/sisyphus/bin/download.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/

--- a/testing/sisyphus/bin/edit-talkback.sh
+++ b/testing/sisyphus/bin/edit-talkback.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/
@@ -130,73 +130,73 @@ if [[ $talkback -eq 1 ]]; then
     if [[ ! -e master.sed ]]; then
         #echo "$0: editing talkback master.ini in `pwd`"
         cp $TEST_BIN/master.sed .
         sed -f master.sed -i.bak master.ini
     fi
 
     case $OSID in
         win32)
-        vendorid=`dos2unix < master.ini | grep '^VendorID = "' | sed 's@VendorID = "\([^"]*\)"@\1@'`
-        productid=`dos2unix < master.ini | grep '^ProductID = "' | sed 's@ProductID = "\([^"]*\)"@\1@'`
-        platformid=`dos2unix < master.ini | grep '^PlatformID = "' | sed 's@PlatformID = "\([^"]*\)"@\1@'`
-        buildid=`dos2unix < master.ini | grep '^BuildID = "' | sed 's@BuildID = "\([^"]*\)"@\1@'`
-        appdata=`cygpath -a -d "$APPDATA"`
-        talkbackdir="`cygpath -a -u $appdata`/Talkback"
-        ;;
+            vendorid=`dos2unix < master.ini | grep '^VendorID = "' | sed 's@VendorID = "\([^"]*\)"@\1@'`
+            productid=`dos2unix < master.ini | grep '^ProductID = "' | sed 's@ProductID = "\([^"]*\)"@\1@'`
+            platformid=`dos2unix < master.ini | grep '^PlatformID = "' | sed 's@PlatformID = "\([^"]*\)"@\1@'`
+            buildid=`dos2unix < master.ini | grep '^BuildID = "' | sed 's@BuildID = "\([^"]*\)"@\1@'`
+            appdata=`cygpath -a -d "$APPDATA"`
+            talkbackdir="`cygpath -a -u $appdata`/Talkback"
+            ;;
         linux)
-        vendorid=`dos2unix < master.ini | grep '^VendorID = "' | sed 's@VendorID = "\([^"]*\)"@\1@'`
-        productid=`dos2unix < master.ini | grep '^ProductID = "' | sed 's@ProductID = "\([^"]*\)"@\1@'`
-        platformid=`dos2unix < master.ini | grep '^PlatformID = "' | sed 's@PlatformID = "\([^"]*\)"@\1@'`
-        buildid=`dos2unix < master.ini | grep '^BuildID = "' | sed 's@BuildID = "\([^"]*\)"@\1@'`
-        talkbackdir="$HOME/.fullcircle"
-        ;;
+            vendorid=`dos2unix < master.ini | grep '^VendorID = "' | sed 's@VendorID = "\([^"]*\)"@\1@'`
+            productid=`dos2unix < master.ini | grep '^ProductID = "' | sed 's@ProductID = "\([^"]*\)"@\1@'`
+            platformid=`dos2unix < master.ini | grep '^PlatformID = "' | sed 's@PlatformID = "\([^"]*\)"@\1@'`
+            buildid=`dos2unix < master.ini | grep '^BuildID = "' | sed 's@BuildID = "\([^"]*\)"@\1@'`
+            talkbackdir="$HOME/.fullcircle"
+            ;;
         mac)
-        # hack around Mac's use of spaces in directory names
-        vendorid=`grep '^VendorID = "' master.ini | sed 's@VendorID = "\([^"]*\)"@\1@'`
-        productid=`grep '^ProductID = "' master.ini | sed 's@ProductID = "\([^"]*\)"@\1@'`
-        platformid=`grep '^PlatformID = "' master.ini | sed 's@PlatformID = "\([^"]*\)"@\1@'`
-        buildid=`grep '^BuildID = "' master.ini | sed 's@BuildID = "\([^"]*\)"@\1@'`
-        talkbackdir="$HOME/Library/Application Support/FullCircle"
-        IFS=:
-        ;;
+            # hack around Mac's use of spaces in directory names
+            vendorid=`grep '^VendorID = "' master.ini | sed 's@VendorID = "\([^"]*\)"@\1@'`
+            productid=`grep '^ProductID = "' master.ini | sed 's@ProductID = "\([^"]*\)"@\1@'`
+            platformid=`grep '^PlatformID = "' master.ini | sed 's@PlatformID = "\([^"]*\)"@\1@'`
+            buildid=`grep '^BuildID = "' master.ini | sed 's@BuildID = "\([^"]*\)"@\1@'`
+            talkbackdir="$HOME/Library/Application Support/FullCircle"
+            IFS=:
+            ;;
         *)
-        error "unknown os $OSID"
-        ;;
-        esac
+            error "unknown os $OSID"
+            ;;
+    esac
 
-        if [[ -z "$talkbackdir" ]]; then
-            error "empty talkback directory"
-        fi
+    if [[ -z "$talkbackdir" ]]; then
+        error "empty talkback directory"
+    fi
 
-        mkdir -p "$talkbackdir"
-        
-        case $OSID in
-            win32)
+    mkdir -p "$talkbackdir"
+    
+    case $OSID in
+        win32)
             talkbackinidir="$talkbackdir/$vendorid/$productid/$platformid/$buildid"
             ;;
-            linux | mac )
+        linux | mac )
             talkbackinidir="$talkbackdir/$vendorid$productid$platformid$buildid"
             ;;
-        esac
-        
-        if [[ ! -d "$talkbackinidir" ]]; then
-            create-directory.sh -d "$talkbackinidir" -n
-        fi
+    esac
+    
+    if [[ ! -d "$talkbackinidir" ]]; then
+        create-directory.sh -d "$talkbackinidir" -n
+    fi
 
-        cd $talkbackinidir
+    cd $talkbackinidir
 
-        cp /work/mozilla/mozilla.com/test.mozilla.com/www/talkback/$OSID/Talkback.ini .
+    cp /work/mozilla/mozilla.com/test.mozilla.com/www/talkback/$OSID/Talkback.ini .
 
-        case "$OSID" in
-            win32)
+    case "$OSID" in
+        win32)
             sed -i.bak "s@URLEdit .*@URLEdit = \"mozqa:$talkbackid\"@" Talkback.ini
             ;;
-            linux )
+        linux )
             sed -i.bak "s@URLEditControl .*@URLEditControl = \"mozqa:$talkbackid\"@" Talkback.ini
             ;;
-            mac )
+        mac )
             sed -i.bak "s@URLEditControl .*@URLEditControl = \"mozqa:$talkbackid\"@" Talkback.ini
             ;;
-            *)
+        *)
             error "unknown os=$OSID"
-        esac
-        fi
+    esac
+fi

--- a/testing/sisyphus/bin/install-build.sh
+++ b/testing/sisyphus/bin/install-build.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/

--- a/testing/sisyphus/bin/install-extensions.sh
+++ b/testing/sisyphus/bin/install-extensions.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/

--- a/testing/sisyphus/bin/install-plugins.sh
+++ b/testing/sisyphus/bin/install-plugins.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/

--- a/testing/sisyphus/bin/library.sh
+++ b/testing/sisyphus/bin/library.sh
@@ -55,20 +55,16 @@ fi
 
 if [[ -z "$LIBRARYSH" ]]; then
 
     LIBRARYSH=1
 
     # export variables
     set -a 
 
-    # make pipelines return exit code of intermediate steps
-    # requires bash 3.x
-    set -o pipefail 
-
     # set time format for pipeline timing reports
     TIMEFORMAT="Elapsed time %0R seconds, User %0U seconds, System %0S seconds, CPU %P%%"
 
     MALLOC_CHECK_=2
 
     ulimit -c 0
 
     # debug msg
@@ -150,89 +146,89 @@ if [[ -z "$LIBRARYSH" ]]; then
             error "get_executable: executable directory \"$get_executable_directory\" does not exist"
         else
             # should use /u+x,g+x,a+x but mac os x uses an obsolete find
             # filter the output to remove extraneous file in dist/bin for
             # cvs builds on mac os x.
             get_executable_name="$get_executable_product${EXE_EXT}"
             case "$OSID" in
                 mac)
-    get_executable_filter="Contents/MacOS/$get_executable_product"
-    if [[ "$get_executable_product" == "thunderbird" ]]; then
-        get_executable_name="$get_executable_product-bin"
-    fi
-    ;;
-    *)
-    get_executable_filter="$get_executable_product"
-    esac
-    if find "$get_executable_directory" -perm +111 -type f \
-        -name "$get_executable_name" | \
-        grep "$get_executable_filter"; then
-        true
-    fi
-fi
-}
+                    get_executable_filter="Contents/MacOS/$get_executable_product"
+                    if [[ "$get_executable_product" == "thunderbird" ]]; then
+                        get_executable_name="$get_executable_product-bin"
+                    fi
+                    ;;
+                *)
+                    get_executable_filter="$get_executable_product"
+            esac
+            if find "$get_executable_directory" -perm +111 -type f \
+                -name "$get_executable_name" | \
+                grep "$get_executable_filter"; then
+                true
+            fi
+        fi
+    }
 
-if [[ "$0" == "-bash" || "$0" == "bash" ]]; then
-    SCRIPT="library.sh"
-else
-    SCRIPT=`basename $0`
-fi
+    if [[ "$0" == "-bash" || "$0" == "bash" ]]; then
+        SCRIPT="library.sh"
+    else
+        SCRIPT=`basename $0`
+    fi
 
-TEST_DIR=${TEST_DIR:-/work/mozilla/mozilla.com/test.mozilla.com/www}
-TEST_BIN=${TEST_BIN:-$TEST_DIR/bin}
-TEST_HTTP=${TEST_HTTP:-test.mozilla.com}
-TEST_STARTUP_TIMEOUT=${TEST_STARTUP_TIMEOUT:-30}
+    TEST_DIR=${TEST_DIR:-/work/mozilla/mozilla.com/test.mozilla.com/www}
+    TEST_BIN=${TEST_BIN:-$TEST_DIR/bin}
+    TEST_HTTP=${TEST_HTTP:-test.mozilla.com}
+    TEST_STARTUP_TIMEOUT=${TEST_STARTUP_TIMEOUT:-30}
 
-TEST_TIMEZONE=`date +%z`
+    TEST_TIMEZONE=`date +%z`
 
-TEST_MACHINE=`uname -n`
-TEST_KERNEL=`uname -r`
-TEST_PROCESSORTYPE=`uname -p`
+    TEST_MACHINE=`uname -n`
+    TEST_KERNEL=`uname -r`
+    TEST_PROCESSORTYPE=`uname -p`
 
-# set path to make life easier
-if ! echo ${PATH} | grep -q $TEST_BIN; then
-    PATH=${TEST_BIN}:$PATH
-fi
+    # set path to make life easier
+    if ! echo ${PATH} | grep -q $TEST_BIN; then
+        PATH=${TEST_BIN}:$PATH
+    fi
 
-if echo $OSTYPE | grep -iq cygwin; then
-    OSID=win32
-    EXE_EXT=".exe"
-elif echo $OSTYPE | grep -iq Linux; then
-    OSID=linux
-    EXE_EXT=
-elif echo $OSTYPE | grep -iq darwin; then
-    OSID=mac
-    EXE_EXT=
-else
-    error "Unknown OS $OSTYPE"
-fi
+    if echo $OSTYPE | grep -iq cygwin; then
+        OSID=win32
+        EXE_EXT=".exe"
+    elif echo $OSTYPE | grep -iq Linux; then
+        OSID=linux
+        EXE_EXT=
+    elif echo $OSTYPE | grep -iq darwin; then
+        OSID=mac
+        EXE_EXT=
+    else
+        error "Unknown OS $OSTYPE"
+    fi
 
-# save starting directory
-STARTDIR=`pwd`
+    # save starting directory
+    STARTDIR=`pwd`
 
-# location of the script.
-SCRIPTDIR=`dirname $0`
+    # location of the script.
+    SCRIPTDIR=`dirname $0`
 
-# don't attach to running instance
-MOZ_NO_REMOTE=1
+    # don't attach to running instance
+    MOZ_NO_REMOTE=1
 
-# don't restart
-NO_EM_RESTART=1
+    # don't restart
+    NO_EM_RESTART=1
 
-# bypass profile manager
-MOZ_BYPASS_PROFILE_AT_STARTUP=1
+    # bypass profile manager
+    MOZ_BYPASS_PROFILE_AT_STARTUP=1
 
-# ah crap handler timeout
-MOZ_GDB_SLEEP=10
+    # ah crap handler timeout
+    MOZ_GDB_SLEEP=10
 
-# no dialogs on asserts
-XPCOM_DEBUG_BREAK=${XPCOM_DEBUG_BREAK:-warn}
+    # no dialogs on asserts
+    XPCOM_DEBUG_BREAK=${XPCOM_DEBUG_BREAK:-warn}
 
-# no airbag
-unset MOZ_AIRBAG
-MOZ_CRASHREPORTER_DISABLE=1
-MOZ_CRASHREPORTER_NO_REPORT=1
+    # no airbag
+    unset MOZ_AIRBAG
+    MOZ_CRASHREPORTER_DISABLE=1
+    MOZ_CRASHREPORTER_NO_REPORT=1
 
-#leak gauge
-#NSPR_LOG_MODULES=DOMLeak:5,DocumentLeak:5,nsDocShellLeak:5
+    #leak gauge
+    #NSPR_LOG_MODULES=DOMLeak:5,DocumentLeak:5,nsDocShellLeak:5
 
 fi

--- a/testing/sisyphus/bin/sayvars.sh
+++ b/testing/sisyphus/bin/sayvars.sh
@@ -1,6 +1,6 @@
-#!/usr/local/bin/bash -e 
+#!/bin/bash -e 
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 
 for var in `echo ${!TEST_*}`; do 
 	echo ${var}=${!var} >> $TEST_LOG 
 done

--- a/testing/sisyphus/bin/set-build-env.sh
+++ b/testing/sisyphus/bin/set-build-env.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash
+#!/bin/bash
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/
@@ -33,19 +33,19 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 export BUILDDIR=/work/mozilla/builds
-export SHELL=/usr/local/bin/bash
-export CONFIG_SHELL=/usr/local/bin/bash
-export CONFIGURE_ENV_ARGS=/usr/local/bin/bash 
+export SHELL=/bin/bash
+export CONFIG_SHELL=/bin/bash
+export CONFIGURE_ENV_ARGS=/bin/bash 
 export MOZ_CVS_FLAGS="-z3 -q"
 export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 export MOZILLA_OFFICIAL=1
 export BUILD_OFFICIAL=1
 
 #
 # options processing
 #
@@ -155,35 +155,35 @@ for step in step1; do # dummy loop for h
         # extras can't be placed in mozconfigs since not all parts
         # of the build system use mozconfig (e.g. js shell) and since
         # the obj directory is not configurable for them as well thus
         # requiring separate source trees
         #
 
         case "$extra" in
             too-much-gc)
-            export XCFLAGS="-DWAY_TOO_MUCH_GC=1"
-            export CFLAGS="-DWAY_TOO_MUCH_GC=1"
-            export CXXFLAGS="-DWAY_TOO_MUCH_GC=1"
-            ;;
+                export XCFLAGS="-DWAY_TOO_MUCH_GC=1"
+                export CFLAGS="-DWAY_TOO_MUCH_GC=1"
+                export CXXFLAGS="-DWAY_TOO_MUCH_GC=1"
+                ;;
             gcov)
 
-            if [[ "$OSID" == "win32" ]]; then
-                echo "win32 does not support gcov"
+                if [[ "$OSID" == "win32" ]]; then
+                    echo "win32 does not support gcov"
                     myexit 1
-            fi
-            export CFLAGS="--coverage"
-            export CXXFLAGS="--coverage"
-            export XCFLAGS="--coverage"
-            export OS_CFLAGS="--coverage"
-            export LDFLAGS="--coverage"
-            export XLDOPTS="--coverage"	
-            ;;
+                fi
+                export CFLAGS="--coverage"
+                export CXXFLAGS="--coverage"
+                export XCFLAGS="--coverage"
+                export OS_CFLAGS="--coverage"
+                export LDFLAGS="--coverage"
+                export XLDOPTS="--coverage"	
+                ;;
             jprof)
-            ;;
+                ;;
         esac
     fi
 
     if [[ ! -d $TREE ]]; then
         echo "Build directory $TREE does not exist"
         myexit 2
     fi
 
@@ -205,18 +205,18 @@ for step in step1; do # dummy loop for h
     if [[ $buildtype == "debug" ]]; then
         unset BUILD_OPT
     else
         export BUILD_OPT=1
     fi
 
     case "$OSID" in
         mac)
-        export JS_EDITLINE=1 # required for mac
-        ;;
+            export JS_EDITLINE=1 # required for mac
+            ;;
     esac
     # end js shell builds
 
     set | sed 's/^/environment: /'
     echo "mozconfig: $MOZCONFIG"
     cat $MOZCONFIG | sed 's/^/mozconfig: /'
 done
 

--- a/testing/sisyphus/bin/smoke-build.sh
+++ b/testing/sisyphus/bin/smoke-build.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/
 #

--- a/testing/sisyphus/bin/test-setup.sh
+++ b/testing/sisyphus/bin/test-setup.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/
@@ -68,40 +68,40 @@ variable            description
                     default will be the basename of the url saved to the
                     /tmp directory. If there is no basename, then the
                     filepath will be /tmp/\$product-\$branch-file.
 -B buildcommands    optional. one or more of clean checkout build
 -T buildtype        optional. one of opt debug
 -x executablepath   optional. directory tree containing executable with same 
                     name as product. If the build is downloaded and executable 
                     path is not specified, it will be defaulted to 
-    /tmp/\$product-\$branch. 
-    For cvs builds it will be defaulted to the appropriate 
-    directory in 
-    /work/mozilla/builds/\$branch/mozilla/\$product-\$buildtype/
-    -N profilename      optional. profilename. profilename is required if 
-    profiledirectory or extensiondir are specified.
-    -D profiledirectory optional. If profiledirectory is specified, a new profile 
-    will be created in the directory.
-    -L profiletemplate  optional. If a new profile is created, profiletemplate is 
-    the path to an existing profile which will be copied over 
-    the new profile.
-    -U userpreferences  optional. If a new profile is created, userpreferences is 
-    the path to a user.js file to be copied into the new 
-    profile.
-    If userpreferences is not specified when a new profile is 
-    created, it is defaulted to
-    /work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
-    -E extensiondir     optional. path to directory tree containing extensions to 
-    be installed.
-    -d datafiles        optional. one or more filenames of files containing 
-    environment variable definitions to be included.
+                    /tmp/\$product-\$branch. 
+                    For cvs builds it will be defaulted to the appropriate 
+                    directory in 
+                    /work/mozilla/builds/\$branch/mozilla/\$product-\$buildtype/
+-N profilename      optional. profilename. profilename is required if 
+                    profiledirectory or extensiondir are specified.
+-D profiledirectory optional. If profiledirectory is specified, a new profile 
+                    will be created in the directory.
+-L profiletemplate  optional. If a new profile is created, profiletemplate is 
+                    the path to an existing profile which will be copied over 
+                    the new profile.
+-U userpreferences  optional. If a new profile is created, userpreferences is 
+                    the path to a user.js file to be copied into the new 
+                    profile.
+                    If userpreferences is not specified when a new profile is 
+                    created, it is defaulted to
+                    /work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
+-E extensiondir     optional. path to directory tree containing extensions to 
+                    be installed.
+-d datafiles        optional. one or more filenames of files containing 
+                    environment variable definitions to be included.
 
-    note that the environment variables should have the same 
-    names as in the "variable" column.
+note that the environment variables should have the same 
+names as in the "variable" column.
 
 EOF
     exit 1
 }
 
 unset product branch url filepath credentials buildcommands buildtype executablepath profilename profiledirectory profiletemplate userpreferences extenstiondir datafiles
 
 while getopts $options optname ; 

--- a/testing/sisyphus/bin/tester.sh
+++ b/testing/sisyphus/bin/tester.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash
+#!/bin/bash
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/

--- a/testing/sisyphus/bin/uninstall-build.sh
+++ b/testing/sisyphus/bin/uninstall-build.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/

--- a/testing/sisyphus/tests/mozilla.org/download-page/test.sh
+++ b/testing/sisyphus/tests/mozilla.org/download-page/test.sh
@@ -1,9 +1,9 @@
-#!/usr/local/bin/bash -e
+#!/bin/bash -e
 
 TEST_DIR=${TEST_DIR:-/work/mozilla/mozilla.com/test.mozilla.com/www}
 TEST_BIN=${TEST_BIN:-$TEST_DIR/bin}
 source ${TEST_BIN}/library.sh
 
 TEST_DLDIR=${TEST_DLDIR:-$TEST_DIR/tests/mozilla.org/download-page}
 
 TEST_DOWNLOAD_PAGE_TIMEOUT=${TEST_DOWNLOAD_PAGE_TIMEOUT:-60}