From b66c4e1b676da43ad771ec06d4d54f274f038626 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Thu, 6 Dec 2018 01:26:19 -0500
Subject: Change build order

---
 etc/hstdp-2018.3a/tasks/001-packages.sh        | 43 ++++++++++++++++++++++++++
 etc/hstdp-2018.3a/tasks/001-python-packages.sh | 40 ------------------------
 etc/hstdp-2018.3a/tasks/002-packages.sh        | 43 --------------------------
 etc/hstdp-2018.3a/tasks/002-python-packages.sh | 40 ++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 83 deletions(-)
 create mode 100755 etc/hstdp-2018.3a/tasks/001-packages.sh
 delete mode 100755 etc/hstdp-2018.3a/tasks/001-python-packages.sh
 delete mode 100755 etc/hstdp-2018.3a/tasks/002-packages.sh
 create mode 100755 etc/hstdp-2018.3a/tasks/002-python-packages.sh

diff --git a/etc/hstdp-2018.3a/tasks/001-packages.sh b/etc/hstdp-2018.3a/tasks/001-packages.sh
new file mode 100755
index 0000000..e948120
--- /dev/null
+++ b/etc/hstdp-2018.3a/tasks/001-packages.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+set -e
+set -x
+
+prefix="${TOOLCHAIN}"
+sysconfdir="${TOOLCHAIN_BUILD}/etc/${PIPELINE}"
+reqdir=${sysconfdir}/pkgs
+blddir=builds
+
+export PATH="${prefix}/bin:${PATH}"
+export CFLAGS="-I${prefix}/include"
+export LDFLAGS="-L${prefix}/lib -Wl,-rpath=${prefix}/lib"
+export PREFIX="${prefix}"
+
+function pre()
+{
+    if [[ ! -d ${reqdir} ]]; then
+        # Nothing there, but maybe that's on purpose.
+        exit 0
+    fi
+    mkdir -p "${blddir}"
+    pushd ${blddir} &>/dev/null
+}
+
+function build()
+{
+    pre
+    # Iterate over binary package build scripts
+    for req in ${reqdir}/*
+    do
+        chmod +x "${req}"
+        "${req}"
+    done
+    post
+}
+
+function post()
+{
+    popd &>/dev/null
+    [[ -d ${blddir} ]] && rm -rf "${blddir}"
+}
+
+build
diff --git a/etc/hstdp-2018.3a/tasks/001-python-packages.sh b/etc/hstdp-2018.3a/tasks/001-python-packages.sh
deleted file mode 100755
index 3d89b6a..0000000
--- a/etc/hstdp-2018.3a/tasks/001-python-packages.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-# Uses GLOBAL environment variable: PYTHON_VERSION defined by `docker build` argument
-prefix="${TOOLCHAIN}"
-sysconfdir="${TOOLCHAIN_BUILD}/etc/${PIPELINE}"
-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 -r "${req}"
-    done
-    post
-}
-
-function post()
-{
-    rm -rf ~/.cache/pip
-    [[ -d src ]] && rm -rf src
-    [[ -f gmon.out ]] && rm -rf gmon.out
-}
-
-build
diff --git a/etc/hstdp-2018.3a/tasks/002-packages.sh b/etc/hstdp-2018.3a/tasks/002-packages.sh
deleted file mode 100755
index e948120..0000000
--- a/etc/hstdp-2018.3a/tasks/002-packages.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-prefix="${TOOLCHAIN}"
-sysconfdir="${TOOLCHAIN_BUILD}/etc/${PIPELINE}"
-reqdir=${sysconfdir}/pkgs
-blddir=builds
-
-export PATH="${prefix}/bin:${PATH}"
-export CFLAGS="-I${prefix}/include"
-export LDFLAGS="-L${prefix}/lib -Wl,-rpath=${prefix}/lib"
-export PREFIX="${prefix}"
-
-function pre()
-{
-    if [[ ! -d ${reqdir} ]]; then
-        # Nothing there, but maybe that's on purpose.
-        exit 0
-    fi
-    mkdir -p "${blddir}"
-    pushd ${blddir} &>/dev/null
-}
-
-function build()
-{
-    pre
-    # Iterate over binary package build scripts
-    for req in ${reqdir}/*
-    do
-        chmod +x "${req}"
-        "${req}"
-    done
-    post
-}
-
-function post()
-{
-    popd &>/dev/null
-    [[ -d ${blddir} ]] && rm -rf "${blddir}"
-}
-
-build
diff --git a/etc/hstdp-2018.3a/tasks/002-python-packages.sh b/etc/hstdp-2018.3a/tasks/002-python-packages.sh
new file mode 100755
index 0000000..3d89b6a
--- /dev/null
+++ b/etc/hstdp-2018.3a/tasks/002-python-packages.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+set -e
+set -x
+
+# Uses GLOBAL environment variable: PYTHON_VERSION defined by `docker build` argument
+prefix="${TOOLCHAIN}"
+sysconfdir="${TOOLCHAIN_BUILD}/etc/${PIPELINE}"
+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 -r "${req}"
+    done
+    post
+}
+
+function post()
+{
+    rm -rf ~/.cache/pip
+    [[ -d src ]] && rm -rf src
+    [[ -f gmon.out ]] && rm -rf gmon.out
+}
+
+build
-- 
cgit