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/hstdp-2018.3a/pkgs/002-hstcal.sh           | 14 ++++++++------
 etc/hstdp-2018.3a/tasks/002-python-packages.sh |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'etc/hstdp-2018.3a')

diff --git a/etc/hstdp-2018.3a/pkgs/002-hstcal.sh b/etc/hstdp-2018.3a/pkgs/002-hstcal.sh
index 8b4ab4f..fe45351 100644
--- a/etc/hstdp-2018.3a/pkgs/002-hstcal.sh
+++ b/etc/hstdp-2018.3a/pkgs/002-hstcal.sh
@@ -3,14 +3,16 @@ name=hstcal
 version=2.2.0
 url="https://github.com/spacetelescope/${name}"
 
+# Grab a version of WAF that isn't broken
+curl -o waf https://waf.io/waf-2.0.12
+chmod +x waf
+
 git clone "${url}"
 pushd "${name}" &>/dev/null
-    # Grab a version of WAF that isn't broken
-    curl -o waf https://waf.io/waf-2.0.12
-    chmod +x waf
+    git checkout "${version}"
 
     # Build / Install
-    ./waf configure --prefix=${PREFIX} --release-with-symbols --with-cfitsio=${PREFIX}
-    ./waf build
-    ./waf install
+    ../waf configure --prefix=${PREFIX} --release-with-symbols --with-cfitsio=${PREFIX}
+    ../waf build
+    ../waf install
 popd &>/dev/null
diff --git a/etc/hstdp-2018.3a/tasks/002-python-packages.sh b/etc/hstdp-2018.3a/tasks/002-python-packages.sh
index 3d89b6a..33714aa 100755
--- a/etc/hstdp-2018.3a/tasks/002-python-packages.sh
+++ b/etc/hstdp-2018.3a/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