Skip to content

Commit ca7ea4a

Browse files
Your NameLiruMouse
Your Name
authored andcommitted
Correctly use Python2
1 parent e6dc4d4 commit ca7ea4a

21 files changed

+22
-22
lines changed

indra/cmake/Python.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ if (WINDOWS)
3030
)
3131
endif()
3232

33-
elseif (EXISTS /etc/arch-release)
34-
# On Archlinux, use Python 2
33+
elseif (EXISTS /usr/bin/python2)
34+
# if this is there, use it
3535

3636
find_program(PYTHON_EXECUTABLE python2 PATHS /usr/bin)
3737

indra/cmake/run_build_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python2
22
"""\
33
@file run_build_test.py
44
@author Nat Goodspeed

indra/copy_win_scripts/start-client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python2
22
"""\
33
@file start-client.py
44

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

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

indra/llmessage/tests/test_llsdmessage_peer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python2
22
"""\
33
@file test_llsdmessage_peer.py
44
@author Nat Goodspeed

indra/llmessage/tests/testrunner.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python2
22
"""\
33
@file testrunner.py
44
@author Nat Goodspeed

indra/newview/generate_breakpad_symbols.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python2
22
"""\
33
@file generate_breakpad_symbols.py
44
@author Brad Kittenbrink <[email protected]>

indra/newview/linux_tools/handle_secondlifeprotocol.sh.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
# Send a URL of the form secondlife://... to Second Life.
44
#

indra/newview/linux_tools/install.sh.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
# Install @VIEWER_CHANNEL@. This script can install the viewer both
44
# system-wide and for an individual user.

indra/newview/linux_tools/launch_url.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
# This script loads a web page in the 'default' graphical web browser.
44
# It MUST return immediately (or soon), so the browser should be

indra/newview/linux_tools/refresh_desktop_app_entry.sh.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
SCRIPTSRC=`readlink -f "$0" || echo "$0"`
44
RUN_PATH=`dirname "${SCRIPTSRC}" || echo .`

indra/newview/linux_tools/register_secondlifeprotocol.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
# Register a protocol handler (default: handle_secondlifeprotocol.sh) for
44
# URLs of the form secondlife://...

indra/newview/linux_tools/wrapper.sh.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
## Here are some configuration options for Linux Client Testers.
44
## These options are for self-assisted troubleshooting during this beta

indra/newview/viewer_manifest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python2
22
"""\
33
@file viewer_manifest.py
44
@author Ryan Williams

indra/test/test_llmanifest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/python
1+
#!/usr/bin/env python2
22
"""
33
@file test_llmanifest.py
44
@author Ryan Williams

scripts/check_xml.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
SAVEDIR=`pwd`
44

scripts/clean_translation.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
SAVEDIR=`pwd`
44

scripts/repackage.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
#(C) 2011 SIANA GEARZ
33

44
usage() {

scripts/setup-path.py

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

scripts/template_verifier.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python2
22
"""\
33
@file template_verifier.py
44
@brief Message template compatibility verifier.

scripts/update_source_contributors.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/python
1+
#!/usr/bin/env python2
22
# -*- coding: UTF-8 -*-
33
"""\
44
@file update_source_contributors.py

0 commit comments

Comments
 (0)