summaryrefslogtreecommitdiff
path: root/packaging/docker
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-04-25 05:43:29 +0200
committerLinus Nordberg <linus@nordberg.se>2015-04-25 05:43:29 +0200
commitf174a72d10037e2e6356fbee3f71ea124515d758 (patch)
tree5c4019b35555dd8c1496542f7354ea43740da63b /packaging/docker
parentcbb556663d8706138efb85a4e011c9fca349d33e (diff)
[merge] Print current time after merge has finished.
Sometimes it's interesting to know how long time a merge took.
Diffstat (limited to 'packaging/docker')
-rwxr-xr-xpackaging/docker/catlfish-dev/merge.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging/docker/catlfish-dev/merge.sh b/packaging/docker/catlfish-dev/merge.sh
index b3658cd..40f623c 100755
--- a/packaging/docker/catlfish-dev/merge.sh
+++ b/packaging/docker/catlfish-dev/merge.sh
@@ -22,6 +22,7 @@ while true; do
python /usr/local/src/catlfish/tools/merge.py \
--config /usr/local/etc/catlfish/system.cfg \
--localconfig /usr/local/etc/catlfish/merge.cfg
+ date
echo "merge: waiting $(expr $S2 / 60)m$(expr $S2 % 60)s before merging again"
sleep $S2
done