From 5f7ba7220072f28be1c43c2305bd115cc5238290 Mon Sep 17 00:00:00 2001
From: N <noel.mcloughlin@gmail.com>
Date: Sun, 30 Jun 2019 23:29:05 +0100
Subject: [PATCH] fix(source): fixes for building from source

---
 deepsea/files/default/Makefile | 48 ++++++++++++++++------------------
 deepsea/package/clean.sls      |  2 +-
 deepsea/package/install.sls    |  2 +-
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/deepsea/files/default/Makefile b/deepsea/files/default/Makefile
index 2eddca1..d5e8c5e 100755
--- a/deepsea/files/default/Makefile
+++ b/deepsea/files/default/Makefile
@@ -7,38 +7,36 @@ PYTHON_DEPS=python3-setuptools python3-click python3-tox python3-configobj
 PYTHON=python3
 SET_PYTHON=true
 
-## SUSE ##
 OS=$(shell source /etc/os-release 2>/dev/null ; echo $$ID)
 suse=
 ifneq (,$(findstring opensuse,$(OS)))
-  suse=yes
+suse=yes
 endif
 ifeq ($(OS), sles)
-  suse=yes
+suse=yes
 endif
 ifeq ($(suse), yes)
-  USER=salt
-  GROUP=salt
-  PKG_INSTALL=zypper -n install
+USER=salt
+GROUP=salt
+PKG_INSTALL=zypper -n install
 else
-  ## NON-SUSE ##
-  USER=root
-  GROUP=root
-  ifeq ($(OS), centos)
-     PKG_INSTALL=yum install -y
-     PYTHON_DEPS=rh-python36-setuptools python36-click tox python36-configobj
-  else
-    ifeq ($(OS), fedora)
-       PKG_INSTALL=yum install -y
-    else
-      debian := $(wildcard /etc/debian_version)
-      ifneq ($(strip $(debian)),)
-        SET_PYTHON=rm /usr/bin/python && ln -s /usr/bin/python3 /usr/bin/python
-        PKG_INSTALL=apt-get install -y
-        PYTHON_DEPS=python3-setuptools python3-click tox python3-configobj
-      endif
-    endif
-  endif
+USER=root
+GROUP=root
+ifeq ($(OS), centos)
+PKG_INSTALL=yum install -y
+PYTHON_DEPS=rh-python36-setuptools python36-click tox python36-configobj
+else
+ifeq ($(OS), fedora)
+PKG_INSTALL=yum install -y
+else
+debian := $(wildcard /etc/debian_version)
+ifneq ($(strip $(debian)),)
+PKG_INSTALL=apt-get install -y
+SET_PYTHON=rm /usr/bin/python && ln -s /usr/bin/python3 /usr/bin/python
+PYTHON_DEPS=python3-setuptools python3-click tox python3-configobj
+endif
+endif
+endif
 endif
 
 
@@ -968,7 +966,7 @@ copy-files:
 
 install-deps:
 	# Using '|| true' to suppress failure (packages already installed, etc)
-	$(SET_PYTHON) 2>/dev/null || true
+        $(SET_PYTHON) 2>/dev/null || true
 	$(PKG_INSTALL) $(DEEPSEA_DEPS) || true
 	$(PKG_INSTALL) $(PYTHON_DEPS) || true
 
diff --git a/deepsea/package/clean.sls b/deepsea/package/clean.sls
index 7097ad7..c6dd492 100644
--- a/deepsea/package/clean.sls
+++ b/deepsea/package/clean.sls
@@ -16,7 +16,7 @@ include:
 
 deepsea-package-install-deps-pkg-removed:
   pkg.removed:
-    - name: {{ deepsea.pkg.deps }}
+    - names: {{ deepsea.pkg.deps }}
 
     {%- endif %}
 
diff --git a/deepsea/package/install.sls b/deepsea/package/install.sls
index 210aed1..a93e8c9 100644
--- a/deepsea/package/install.sls
+++ b/deepsea/package/install.sls
@@ -14,7 +14,7 @@ include:
 
 deepsea-package-install-deps-pkg-installed:
   pkg.installed:
-    - name: {{ deepsea.pkg.deps }}
+    - names: {{ deepsea.pkg.deps }}
 
       {%- endif %}