From 4d1a164d0c5b3cdebccbcf3b78d19abee50677c0 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Mon, 18 Feb 2019 15:18:05 -0500
Subject: Remove consolidated scripts

---
 etc/pkgs/001-jupyter.sh | 15 +++++++++++++++
 etc/pkgs/001-tini.sh    | 18 ------------------
 etc/pkgs/002-nodejs.sh  | 17 -----------------
 etc/pkgs/003-jupyter.sh | 15 ---------------
 4 files changed, 15 insertions(+), 50 deletions(-)
 create mode 100755 etc/pkgs/001-jupyter.sh
 delete mode 100755 etc/pkgs/001-tini.sh
 delete mode 100755 etc/pkgs/002-nodejs.sh
 delete mode 100755 etc/pkgs/003-jupyter.sh

diff --git a/etc/pkgs/001-jupyter.sh b/etc/pkgs/001-jupyter.sh
new file mode 100755
index 0000000..dfc312a
--- /dev/null
+++ b/etc/pkgs/001-jupyter.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -x
+
+pip install --upgrade --progress-bar=off \
+    notebook==5.7.2 \
+    jupyterhub==0.9.4 \
+    jupyterlab==0.35.4
+
+jupyter labextension install @jupyterlab/hub-extension@^0.12.0
+jupyter notebook --generate-config -y
+
+# Clean up
+npm cache clean --force
+rm -rf ${TOOLCHAIN}/share/jupyter/lab/staging
+rm -rf /home/${USER_ACCT}/.cache/yarn
diff --git a/etc/pkgs/001-tini.sh b/etc/pkgs/001-tini.sh
deleted file mode 100755
index 44bb172..0000000
--- a/etc/pkgs/001-tini.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-set -x
-
-sudo yum install -y cmake glibc-static || exit 1
-git clone https://github.com/krallin/tini.git
-export CFLAGS="${CFLAGS} -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"
-
-pushd tini
-    git checkout v0.18.0
-    mkdir -p build
-    pushd build
-        cmake ..
-        make
-        install -m755 tini ${TOOLCHAIN_BIN}
-    popd
-popd
-
-rm -rf tini
diff --git a/etc/pkgs/002-nodejs.sh b/etc/pkgs/002-nodejs.sh
deleted file mode 100755
index b52a229..0000000
--- a/etc/pkgs/002-nodejs.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-set -x
-
-name=node
-version=v10.15.0
-srcdir=${name}-${version}
-tarball=${srcdir}.tar.gz
-url=https://nodejs.org/dist/${version}/${tarball}
-
-curl -LO "${url}"
-tar xf "${tarball}"
-pushd "${srcdir}"
-    export CFLAGS="${CFLAGS} -fPIC"
-    ./configure --prefix=${TOOLCHAIN}
-    make -j${_maxjobs}
-    make install
-popd
diff --git a/etc/pkgs/003-jupyter.sh b/etc/pkgs/003-jupyter.sh
deleted file mode 100755
index dfc312a..0000000
--- a/etc/pkgs/003-jupyter.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -x
-
-pip install --upgrade --progress-bar=off \
-    notebook==5.7.2 \
-    jupyterhub==0.9.4 \
-    jupyterlab==0.35.4
-
-jupyter labextension install @jupyterlab/hub-extension@^0.12.0
-jupyter notebook --generate-config -y
-
-# Clean up
-npm cache clean --force
-rm -rf ${TOOLCHAIN}/share/jupyter/lab/staging
-rm -rf /home/${USER_ACCT}/.cache/yarn
-- 
cgit