From 3190d616c3b61ba7f173dba1e46af701bbf2e34c Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Thu, 31 Jan 2019 14:22:54 -0500
Subject: Refactor all

---
 etc/jwstdp-latest/tasks/001-packages.sh        | 5 -----
 etc/jwstdp-latest/tasks/002-python-packages.sh | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'etc/jwstdp-latest/tasks')

diff --git a/etc/jwstdp-latest/tasks/001-packages.sh b/etc/jwstdp-latest/tasks/001-packages.sh
index e948120..e64fe06 100755
--- a/etc/jwstdp-latest/tasks/001-packages.sh
+++ b/etc/jwstdp-latest/tasks/001-packages.sh
@@ -2,15 +2,10 @@
 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()
 {
diff --git a/etc/jwstdp-latest/tasks/002-python-packages.sh b/etc/jwstdp-latest/tasks/002-python-packages.sh
index 3d89b6a..33714aa 100755
--- a/etc/jwstdp-latest/tasks/002-python-packages.sh
+++ b/etc/jwstdp-latest/tasks/002-python-packages.sh
@@ -33,8 +33,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