diff --git a/README.rst b/README.rst index 45ab3524c..0bb83c8c4 100644 --- a/README.rst +++ b/README.rst @@ -22,6 +22,10 @@ or, for Yum-based systems, such as RedHat, CentOS or Fedora:: sudo yum install autoconf automake libtool +or, for Pacman-based systems such as ArchLinux:: + + sudo pacman -Sy autoconf automake libtool + To check out the code from GitHub, including all dependencies that are specified as Git submodules, do the following:: diff --git a/admin/server.py b/admin/server.py index 8aa6bdd78..bfcb99bc7 100755 --- a/admin/server.py +++ b/admin/server.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # -*- coding: utf-8 -*- # diff --git a/admin/upgrade_config.py b/admin/upgrade_config.py index c3e0e7aaa..7e02b11ca 100755 --- a/admin/upgrade_config.py +++ b/admin/upgrade_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Cherokee CLI configuration conversion # diff --git a/cherokee/cherokee-admin-launcher b/cherokee/cherokee-admin-launcher index ff6cdf200..b82df512c 100755 --- a/cherokee/cherokee-admin-launcher +++ b/cherokee/cherokee-admin-launcher @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # -*- coding: utf-8; mode: python -*- # diff --git a/cherokee/cherokee-tweak b/cherokee/cherokee-tweak index 02d8bc90f..72cf39e9c 100755 --- a/cherokee/cherokee-tweak +++ b/cherokee/cherokee-tweak @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # -*- coding: utf-8; mode: python -*- # diff --git a/cherokee/main_admin.c b/cherokee/main_admin.c index cf142a1bb..f072bf945 100644 --- a/cherokee/main_admin.c +++ b/cherokee/main_admin.c @@ -554,7 +554,7 @@ check_for_python (void) int re; pid_t pid; int exitcode = -1; - char const *args[] = {"env", "python", "-c", "raise SystemExit", NULL}; + char const *args[] = {"env", "python2", "-c", "raise SystemExit", NULL}; pid = fork(); if (pid == -1) { diff --git a/contrib/tracelor.py b/contrib/tracelor.py index 3f4865701..3b0df76d0 100755 --- a/contrib/tracelor.py +++ b/contrib/tracelor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 ## ## Cherokee trace colorizer diff --git a/doc/build/asciidoc.py b/doc/build/asciidoc.py index 7df59b877..e2fe42f10 100755 --- a/doc/build/asciidoc.py +++ b/doc/build/asciidoc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 """ asciidoc - converts an AsciiDoc text file to DocBook, HTML or LinuxDoc diff --git a/doc/cookbook_dbslayer.txt b/doc/cookbook_dbslayer.txt index 22e498398..ca820abd4 100644 --- a/doc/cookbook_dbslayer.txt +++ b/doc/cookbook_dbslayer.txt @@ -218,7 +218,7 @@ the server name and prepare a database accessible with the parameters detailed above (database name, user parameters and so on). -------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python2 import urllib sql="SELECT * FROM my_table;" diff --git a/doc/test_images.py b/doc/test_images.py index 9a8b42945..a5eb639df 100755 --- a/doc/test_images.py +++ b/doc/test_images.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Cherokee Doc: Image checker # diff --git a/doc/test_links.py b/doc/test_links.py index 3e1a45213..2765ba955 100755 --- a/doc/test_links.py +++ b/doc/test_links.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Cherokee Doc: Link checker # diff --git a/po/admin/generate_POTFILESin.py b/po/admin/generate_POTFILESin.py index 7b3f77a84..c585bd6de 100755 --- a/po/admin/generate_POTFILESin.py +++ b/po/admin/generate_POTFILESin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Cherokee POTFILES.in generator # diff --git a/po/po_stats.py b/po/po_stats.py index 8f0bcadb4..c8ec16e1b 100755 --- a/po/po_stats.py +++ b/po/po_stats.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # -*- coding: utf-8 -*- # Cherokee PO stats diff --git a/qa/fcgi.py b/qa/fcgi.py index 1b79f4b3f..9d792d8f6 100644 --- a/qa/fcgi.py +++ b/qa/fcgi.py @@ -34,7 +34,7 @@ Example usage: - #!/usr/bin/env python + #!/usr/bin/env python2 from myapplication import app # Assume app is your WSGI application object from fcgi import WSGIServer WSGIServer(app).run() diff --git a/qa/run-tests.py b/qa/run-tests.py index 6a8cdc89c..d71850cb9 100755 --- a/qa/run-tests.py +++ b/qa/run-tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # -*- coding: utf-8 -*- # Cherokee QA Tests