You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/05/24 22:28:05 UTC
[3/6] incubator-trafficcontrol git commit: clean up handling of dist
dir during build
clean up handling of dist dir during build
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3ff0f6d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3ff0f6d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3ff0f6d2
Branch: refs/heads/master
Commit: 3ff0f6d256ba7391b3dd0b54d6fdb240cff9a497
Parents: cee7b63
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed May 24 14:59:51 2017 +0000
Committer: Dewayne Richardson <de...@apache.org>
Committed: Wed May 24 16:27:55 2017 -0600
----------------------------------------------------------------------
infrastructure/docker/build/clean_build.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3ff0f6d2/infrastructure/docker/build/clean_build.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/clean_build.sh b/infrastructure/docker/build/clean_build.sh
index b2b749b..09fc761 100755
--- a/infrastructure/docker/build/clean_build.sh
+++ b/infrastructure/docker/build/clean_build.sh
@@ -31,9 +31,9 @@ trap cleanup EXIT
set -x
# set owner of dist dir -- cleans up existing dist permissions...
-cleanup
+rm -rf /trafficcontrol/dist && mkdir -p /trafficcontrol/dist
+
cp -a /trafficcontrol /tmp/. && \
cd /tmp/trafficcontrol && \
- rm -rf dist && \
- ln -fs /trafficcontrol/dist dist && \
+ rm -rf dist && ln -fs /trafficcontrol/dist dist && \
((((./build/build.sh $1 2>&1; echo $? >&3) | tee ./dist/build-$1.log >&4) 3>&1) | (read x; exit $x)) 4>&1