From 92f2ea6ed46ffae5302a47452d816b5dc5784eb7 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Mon, 28 Jan 2019 12:57:22 -0500
Subject: Reorder tools

---
 etc/tasks/002-python-packages.sh | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100755 etc/tasks/002-python-packages.sh

(limited to 'etc/tasks/002-python-packages.sh')

diff --git a/etc/tasks/002-python-packages.sh b/etc/tasks/002-python-packages.sh
new file mode 100755
index 0000000..cb248ff
--- /dev/null
+++ b/etc/tasks/002-python-packages.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+set -x
+
+# Uses GLOBAL environment variable: PYTHON_VERSION defined by `docker build` argument
+prefix="${TOOLCHAIN}"
+sysconfdir="${TOOLCHAIN_BUILD}/etc"
+reqdir=${sysconfdir}/pip
+
+export PATH="${prefix}/bin:${PATH}"
+export CFLAGS="-I${prefix}/include"
+export LDFLAGS="-L${prefix}/lib -Wl,-rpath=${prefix}/lib"
+
+function pre()
+{
+    if [[ ! -d ${reqdir} ]]; then
+        # Nothing there, but maybe that's on purpose.
+        exit 0
+    fi
+}
+
+function build()
+{
+    pre
+    # Iterate over pip requirement files
+    for req in ${reqdir}/*
+    do
+        pip install --upgrade --progress-bar=off -v -r "${req}"
+    done
+    post
+}
+
+function post()
+{
+    rm -rf ~/.cache/pip
+    [[ -d src ]] && rm -rf src
+    [[ -f gmon.out ]] && rm -rf gmon.out
+}
+
+build
-- 
cgit 


From 73a53c48901e120a06d221c8cb4f02076e3b9888 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 29 Jan 2019 14:38:49 -0500
Subject: Introduce real toolchain

---
 etc/tasks/002-python-packages.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'etc/tasks/002-python-packages.sh')

diff --git a/etc/tasks/002-python-packages.sh b/etc/tasks/002-python-packages.sh
index cb248ff..9218a8e 100755
--- a/etc/tasks/002-python-packages.sh
+++ b/etc/tasks/002-python-packages.sh
@@ -7,6 +7,7 @@ sysconfdir="${TOOLCHAIN_BUILD}/etc"
 reqdir=${sysconfdir}/pip
 
 export PATH="${prefix}/bin:${PATH}"
+export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
 export CFLAGS="-I${prefix}/include"
 export LDFLAGS="-L${prefix}/lib -Wl,-rpath=${prefix}/lib"
 
@@ -24,7 +25,12 @@ function build()
     # Iterate over pip requirement files
     for req in ${reqdir}/*
     do
-        pip install --upgrade --progress-bar=off -v -r "${req}"
+        pip install --upgrade --progress-bar=off -r "${req}"
+        retval=$?
+        if [[ ${retval} != 0 ]]; then
+            echo "BUILD FAILED: ${req}"
+            exit ${retval}
+        fi
     done
     post
 }
@@ -32,8 +38,8 @@ function build()
 function post()
 {
     rm -rf ~/.cache/pip
-    [[ -d src ]] && rm -rf src
-    [[ -f gmon.out ]] && rm -rf gmon.out
+    [[ -d src ]] && rm -rf src || true
+    [[ -f gmon.out ]] && rm -rf gmon.out || true
 }
 
 build
-- 
cgit 


From 11f358cafab2da28692fdaa837dfbcc3cc163736 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Thu, 31 Jan 2019 14:12:13 -0500
Subject: Refactor all

---
 etc/tasks/002-python-packages.sh | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'etc/tasks/002-python-packages.sh')

diff --git a/etc/tasks/002-python-packages.sh b/etc/tasks/002-python-packages.sh
index 9218a8e..bcd0b6f 100755
--- a/etc/tasks/002-python-packages.sh
+++ b/etc/tasks/002-python-packages.sh
@@ -1,16 +1,9 @@
 #!/bin/bash
 set -x
 
-# Uses GLOBAL environment variable: PYTHON_VERSION defined by `docker build` argument
-prefix="${TOOLCHAIN}"
 sysconfdir="${TOOLCHAIN_BUILD}/etc"
 reqdir=${sysconfdir}/pip
 
-export PATH="${prefix}/bin:${PATH}"
-export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
-export CFLAGS="-I${prefix}/include"
-export LDFLAGS="-L${prefix}/lib -Wl,-rpath=${prefix}/lib"
-
 function pre()
 {
     if [[ ! -d ${reqdir} ]]; then
-- 
cgit