use variables more, bugger separate commits

docker/Dockerfile

@@ -5,13 +5,18 @@ MAINTAINER Sparklyballs <sparklyballs@linuxserver.io>
 # set some environment variables
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
 
-ADD defaults/ /defaults/
 
-# Set the locale
+ADD pre_build/ /prebuilds/
+ADD versions.list /prebuilds/
+
+# Set the locale & mk prebuilds folder
 RUN locale-gen en_US.UTF-8
 
-RUN mv /defaults/excludes /etc/dpkg/dpkg.cfg.d/excludes && \ 
-. /defaults/build_apps.list && \
+RUN . /prebuilds/versions.list && \
+kodi_ver="${kodi_version%.*}" && \
+. prebuilds/build_lists/"$kodi_ver"/build_apps.list && \
+
+mv /prebuilds/excludes /etc/dpkg/dpkg.cfg.d/excludes && \
 apt-get update && \ 
 apt-get install $INPUT_APTLIST -qy && \
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

docker/init/40_check_the_patch.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /defaults/variables.list
+. /prebuilds/versions.list
 
 kodi_ver="${kodi_version%.*}"