Skip to content

Commit

Permalink
Rename phoenix folder into assets
Browse files Browse the repository at this point in the history
  • Loading branch information
tboerger committed Sep 16, 2019
1 parent 1b0c737 commit f8343dd
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .bra.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ init_cmds = [
"debug",
"server",
"--asset-path",
"phoenix/"
"assets/"
]
]

Expand All @@ -28,6 +28,6 @@ cmds = [
"debug",
"server",
"--asset-path",
"phoenix/"
"assets/"
]
]
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ coverage.out
/bin
/dist

/phoenix
/assets

/pkg/assets/embed.go
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ sync:
.PHONY: clean
clean:
go clean -i ./...
rm -rf $(BIN) $(DIST) phoenix/
rm -rf $(BIN) $(DIST) assets/

.PHONY: fmt
fmt:
Expand All @@ -67,7 +67,7 @@ lint:
for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done;

.PHONY: generate
generate: phoenix
generate: assets
go generate $(GENERATE)

.PHONY: changelog
Expand Down Expand Up @@ -122,5 +122,5 @@ release-finish: release-copy release-check
docs:
cd docs; hugo

phoenix:
mkdir phoenix/ && curl -slL -o- https://github.com/owncloud/phoenix/releases/download/0.2.1/phoenix.tar.gz | tar xvzf - -C phoenix/
assets:
mkdir assets/ && curl -slL -o- https://github.com/owncloud/phoenix/releases/download/0.2.1/phoenix.tar.gz | tar xvzf - -C assets/
4 changes: 2 additions & 2 deletions pkg/assets/embed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ compression:

custom:
- files:
- "../../phoenix/"
base: "../../phoenix/"
- "../../assets/"
base: "../../assets/"
prefix: ""
exclude:
- "appinfo/**"
Expand Down

0 comments on commit f8343dd

Please sign in to comment.