Correctly use Python2

indra/cmake/Python.cmake

@@ -30,8 +30,8 @@ if (WINDOWS)
       )
   endif()
 
-elseif (EXISTS /etc/arch-release)
+elseif (EXISTS /usr/bin/python2)
-  # On Archlinux, use Python 2
+  # if this is there, use it
 
   find_program(PYTHON_EXECUTABLE python2 PATHS /usr/bin)
 

indra/cmake/run_build_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file   run_build_test.py
 @author Nat Goodspeed

indra/copy_win_scripts/start-client.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file   start-client.py
 

indra/lib/python/indra/util/test_win32_manifest.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file test_win32_manifest.py
 @brief Test an assembly binding version and uniqueness in a windows dll or exe.  

indra/llmessage/tests/test_llsdmessage_peer.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file   test_llsdmessage_peer.py
 @author Nat Goodspeed

indra/llmessage/tests/testrunner.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file   testrunner.py
 @author Nat Goodspeed

indra/newview/generate_breakpad_symbols.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file generate_breakpad_symbols.py
 @author Brad Kittenbrink <brad@lindenlab.com>

indra/newview/linux_tools/handle_secondlifeprotocol.sh.in

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Send a URL of the form secondlife://... to Second Life.
 #

indra/newview/linux_tools/install.sh.in

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Install @VIEWER_CHANNEL@. This script can install the viewer both
 # system-wide and for an individual user.

indra/newview/linux_tools/launch_url.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script loads a web page in the 'default' graphical web browser.
 # It MUST return immediately (or soon), so the browser should be

indra/newview/linux_tools/refresh_desktop_app_entry.sh.in

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 SCRIPTSRC=`readlink -f "$0" || echo "$0"`
 RUN_PATH=`dirname "${SCRIPTSRC}" || echo .`

indra/newview/linux_tools/register_secondlifeprotocol.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Register a protocol handler (default: handle_secondlifeprotocol.sh) for
 # URLs of the form secondlife://...

indra/newview/linux_tools/wrapper.sh.in

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ## Here are some configuration options for Linux Client Testers.
 ## These options are for self-assisted troubleshooting during this beta

indra/newview/viewer_manifest.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file viewer_manifest.py
 @author Ryan Williams

indra/test/test_llmanifest.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 """
 @file test_llmanifest.py
 @author Ryan Williams

scripts/check_xml.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 SAVEDIR=`pwd`
 

scripts/clean_translation.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 SAVEDIR=`pwd`
 

scripts/repackage.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #(C) 2011 SIANA GEARZ
 
 usage() {

scripts/setup-path.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 """\
 @file setup-path.py
 @brief Get the python library directory in the path, so we don't have

scripts/template_verifier.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file template_verifier.py
 @brief Message template compatibility verifier.

scripts/update_source_contributors.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 # -*- coding: UTF-8 -*-
 """\
 @file update_source_contributors.py