@@ -1,18 +1,17 @@

 ASSET_DIRS = $(shell find assets/ -type d)

 ASSET_FILES = $(shell find assets/ -type f)

-all: app.icns CJAWSAccess.app accounts.json $(ASSET_DIRS) $(ASSET_FILES)

+all: app.icns CJAWSAccess.app assets/accounts.json $(ASSET_DIRS) $(ASSET_FILES)

 	rsync -arvh assets/ CJAWSAccess.app/Contents/Resources/

-	cp accounts.json CJAWSAccess.app/Contents/Resources/accounts.json

-	cp app.icns CJAWSAccess.app/Contents/Resources/app.icns

 	touch CJAWSAccess.app

 CJAWSAccess.app: deliver.lisp src/*.lisp aws-access.asd addFonts.patch

 	/Applications/LispWorks\ 7.1\ \(64-bit\)/LispWorks\ \(64-bit\).app/Contents/MacOS/lispworks-7-1-0-amd64-darwin -build deliver.lisp

 	patch -N -p0 < addFonts.patch

-accounts.json: accounts.yml

+assets/accounts.json: accounts.yml

 	./flip-yaml.lisp accounts.yml

+	cp accounts.json assets/

 accounts.yml:

 	git archive --format=tar --remote=git@gitlab.cj.com:operations-chapter/aws-department.git heads/master -- accounts.yaml | tar xO accounts.yaml > ~/accounts.yml

@@ -28,5 +27,5 @@ cleanDmg:

 	rm -f CJAWSAccess.dmg

 clean: cleanDmg

-	rm -f accounts.json

+	rm -f assets/accounts.json

 	rm -rf CJAWSAccess.app

@@ -13,7 +13,14 @@

          (create-macos-application-bundle

           "CJAWSAccess.app"

           :document-types nil

-          :identifier "fwoar.cj.AWSAccess")

+          :application-icns "app.icns"

+          :identifier "fwoar.cj.AWSAccess"

+          :version (asdf:component-version

+                    (asdf:find-system :aws-access))

+          :build (concatenate 'string

+                              (subseq (uiop:run-program (list "git" "rev-parse" "HEAD") :output :string)

+                                      0 7)

+                              (uiop:run-program (list "zsh" "scripts/dirty-tag") :output :string)))

          0

          :KEEP-PRETTY-PRINTER t

          :interface :capi

new file mode 100755

@@ -0,0 +1,3 @@

+#!/usr/bin/env sh

+

+(git diff --quiet && git status --short &>>/dev/null) || echo -n -dirty