X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/969a16ec1b77f585675ae9cb9660e72682c99348..ee3ea64385ba6c409f74c8a2f2a367f007a44bd6:/Makefile

diff --git a/Makefile b/Makefile
index a543d464..98c0e519 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# Use bash, and run all lines in each recipe as one shell command
+SHELL := /bin/bash
+.ONESHELL:
+
 APP_NAME?=arvados-workbench2
 
 # GIT_TAG is the last tagged stable release (i.e. 1.2.0)
@@ -34,7 +38,7 @@ DEST_DIR=/var/www/arvados-workbench2/workbench2/
 DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
 
 # redHat package file
-RPM_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION).x86_64.rpm
+RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
 
 export WORKSPACE?=$(shell pwd)
 
@@ -66,7 +70,7 @@ yarn-install:
 	yarn install
 
 test: yarn-install
-	yarn test	--no-watchAll --bail --ci
+	yarn test --no-watchAll --bail --ci
 
 build: test
 	yarn build
@@ -80,7 +84,7 @@ $(DEB_FILE): build
 	 --iteration "$(ITERATION)" \
 	 --maintainer="$(MAINTAINER)" \
 	 --description="$(DESCRIPTION)" \
-	 --deb-no-default-config-files \
+	 --config-files="etc/arvados/workbench2/workbench2.example.json" \
 	$(WORKSPACE)/build/=$(DEST_DIR)
 
 $(RPM_FILE): build
@@ -92,7 +96,19 @@ $(RPM_FILE): build
 	 --iteration "$(ITERATION)" \
 	 --maintainer="$(MAINTAINER)" \
 	 --description="$(DESCRIPTION)" \
+	 --config-files="etc/arvados/workbench2/workbench2.example.json" \
 	 $(WORKSPACE)/build/=$(DEST_DIR)
 
+copy: $(DEB_FILE) $(RPM_FILE)
+	for target in $(TARGETS); do \
+		if [[ $$target =~ ^centos ]]; then
+			cp -p $(RPM_FILE) packages/$$target ; \
+		else
+			cp -p $(DEB_FILE) packages/$$target ; \
+		fi
+	done
+	rm -f $(RPM_FILE)
+	rm -f $(DEB_FILE)
+
 # use FPM to create DEB and RPM
-packages: $(DEB_FILE) $(RPM_FILE)
+packages: copy