Merge ~barryprice/apache2-charm/+git/apache2-charm:master into apache2-charm:master

[Barry Price]

Make all python calls explicitly python2, to avoid any ambiguity when we finally port this to python3

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 4165c49d2de53e93f92f765dc857e41837e1e4e1

diff --git a/Makefile b/Makefile
index d4f9cb5..82a7396 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ HOOKS_DIR := $(PWD)/hooks
 TEST_PREFIX := PYTHONPATH=$(HOOKS_DIR)
 TEST_DIR := $(PWD)/hooks/tests
 CHARM_DIR := $(PWD)
-PYTHON := /usr/bin/env python
+PYTHON2 := /usr/bin/env python2
 
 
 build: test lint proof
@@ -43,7 +43,7 @@ sourcedeps:
 	@echo Updating source dependencies...
 	@mkdir -p build
 	@git clone lp:charm-helpers build/charm-helpers
-	@$(PYTHON) build/charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
+	@$(PYTHON2) build/charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
 		-c charm-helpers.yaml \
 		-r build/charm-helpers \
 		-d hooks/charmhelpers
diff --git a/hooks/install b/hooks/install
index 5bd0001..c808b3c 100755
--- a/hooks/install
+++ b/hooks/install
@@ -12,13 +12,10 @@ DISTRIB_CODENAME=$(grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2)
 if [ "${DISTRIB_CODENAME}" = "focal" ]; then
     juju-log 'Ensuring python2, python-apt and python-yaml are installed'
     apt-get install -y python2 python-apt python-yaml
-
-    juju-log 'Invoking python2-based install hook'
-    python2 hooks/hooks.py install
 else
     juju-log 'Ensuring python, python-apt and python-yaml are installed'
     apt-get install -y python python-apt python-yaml
-
-    juju-log 'Invoking python-based install hook'
-    python hooks/hooks.py install
 fi
+
+juju-log 'Invoking python2-based install hook'
+python2 hooks/hooks.py install