diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2019-01-31 14:22:54 -0500 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2019-01-31 14:22:54 -0500 |
| commit | 3190d616c3b61ba7f173dba1e46af701bbf2e34c (patch) | |
| tree | e816864a7a1a2c111bb1cc88e1f63900117c9be4 /etc/jwstdp-latest/tasks | |
| parent | f17f08d418e285d28b9b414b657e287556566497 (diff) | |
| download | docker-pipeline-3190d616c3b61ba7f173dba1e46af701bbf2e34c.tar.gz | |
Refactor all
Diffstat (limited to 'etc/jwstdp-latest/tasks')
| -rwxr-xr-x | etc/jwstdp-latest/tasks/001-packages.sh | 5 | ||||
| -rwxr-xr-x | etc/jwstdp-latest/tasks/002-python-packages.sh | 4 |
2 files changed, 2 insertions, 7 deletions
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 |