osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31726 ) Change subject: publish: make sure OSMO_REPOSITORY isn't default ...................................................................... publish: make sure OSMO_REPOSITORY isn't default Instead of checking whether OSMO_REPOSITORY is empty, check if it has the default value of "osmo-gsm-manuals" and print a meaningful error if that is the case. Otherwise it leads to manuals getting uploaded into an "osmo-gsm-manuals" directory. Related: OS#5902 Change-Id: Ie21d58dd57a893a83f566eea464ab3eec82b67a4 --- M build/Makefile.common.inc 1 file changed, 24 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/26/31726/1 diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc index a9a8ddf..28a607f 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -30,7 +30,15 @@ distclean: clean publish: $(UPLOAD_FILES) - [ -n "$(OSMO_REPOSITORY)" ] || exit 1 + @if [ "$(OSMO_REPOSITORY)" = "osmo-gsm-manuals" ]; then \ + echo; \ + echo "ERROR: set OSMO_REPOSITORY to the project name (e.g. osmo-hlr)" \ + "before including Makefile.common.inc."; \ + echo "This will be the name of the directory here:" \ + "https://downloads.osmocom.org/docs/"; \ + echo; \ + exit 1; \ + fi rm -rf "$(PUBLISH_TEMPDIR)" mkdir -p "$(PUBLISH_TEMPDIR)/$(OSMO_REPOSITORY)/$(PUBLISH_REF)" cp $(UPLOAD_FILES) "$(PUBLISH_TEMPDIR)/$(OSMO_REPOSITORY)/$(PUBLISH_REF)" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ie21d58dd57a893a83f566eea464ab3eec82b67a4 Gerrit-Change-Number: 31726 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange