diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-25 19:00:37 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-25 19:01:30 (GMT) |
| commit | c6a060dba84e71959ca47779830269a6ca53a77b (patch) | |
| tree | 3aaa6a47bbc52382251dfa25f25ec1a12b11a41a | |
| parent | 8bc2d52ca9a086d12d2044c3ef3feb4d7bedc388 (diff) | |
Pass dir and filename when notifying upload completion
| -rw-r--r-- | Makefile.buildbot | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.buildbot b/Makefile.buildbot index 69e847c..9526b7e 100644 --- a/Makefile.buildbot +++ b/Makefile.buildbot @@ -2,8 +2,9 @@ DOCS_SOURCE=$(SOURCE_DIR)/sugar-docs/build/ DOCS_DEST=dnarvaez@shell.sugarlabs.org:~/public_html/sugar-docs/ SNAPSHOT_DEST_HOST=dnarvaez@shell.sugarlabs.org -SNAPSHOT_DEST_DIR=/home/dnarvaez/public_html/snapshots/ -SNAPSHOT_DEST=$(SNAPSHOT_DEST_HOST):$(SNAPSHOT_DEST_DIR)$(SUGAR_BUILDBOT) +SNAPSHOT_DEST_ROOT=/home/dnarvaez/public_html/snapshots/ +SNAPSHOT_DEST_DIR=$(SUGAR_BUILDBOT) +SNAPSHOT_DEST_PATH=$(SNAPSHOT_DEST_ROOT)$(SNAPSHOT_DEST_DIR) SNAPSHOT_FILENAME=sugar-snapshot.tar SNAPSHOT_PATH=$(SNAPSHOT_TMP_DIR)/$(SNAPSHOT_FILENAME) SNAPSHOT_TMP_DIR:=$(shell mktemp -dut sugar-snapshot-XXXXXXXX) @@ -19,13 +20,14 @@ snapshot-build: helpers-build snapshot-copy: snapshot-build @echo "Uploading snapshot" - @scp $(SNAPSHOT_PATH).xz $(SNAPSHOT_DEST) + @scp $(SNAPSHOT_PATH).xz $(SNAPSHOT_DEST_HOST):$(SNAPSHOT_DEST_PATH) snapshot-clean: @rm -rf $(SNAPSHOT_TMP_DIR) snapshot-notify: @echo "Notifying about upload completion" - @ssh $(SNAPSHOT_DEST_HOST) $(SNAPSHOT_DEST_DIR)/upload-completed + @ssh $(SNAPSHOT_DEST_HOST) $(SNAPSHOT_DEST_ROOT)/upload-completed \ + $(SNAPSHOT_DEST_DIR) $(SNAPSHOT_FILENAME) snapshot-upload: snapshot-copy snapshot-clean snapshot-notify |