Skip to content

Commit

Permalink
Merge pull request #3 from OSC/theme
Browse files Browse the repository at this point in the history
Fix packaging of ondemand theme for dex
  • Loading branch information
treydock authored Jul 6, 2020
2 parents be241b7 + d56ddc8 commit d3aff46
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*.tar.gz
/packaging/theme
/packaging/theme.tar.gz
/packaging/tmp
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.PHONY: packaging

packaging:
[ -d packaging/theme ] && rm -rf packaging/theme || :
cp -r theme packaging/theme
tar czvf packaging/theme.tar.gz theme/*
5 changes: 3 additions & 2 deletions packaging/ondemand-dex.spec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ License: Apache-2.0
URL: https://github.com/dexidp/dex
Source0: https://github.com/dexidp/dex/archive/v%{version}.tar.gz
Source1: https://dl.google.com/go/go%{go_version}.linux-amd64.tar.gz
Source2: theme
Source2: theme.tar.gz

BuildRequires: ondemand-scldevel
BuildRequires: systemd
Expand Down Expand Up @@ -53,7 +53,8 @@ cd $GOPATH/src/github.com/dexidp/dex/
touch %{buildroot}%{confdir}/dex.db
%__mkdir_p %{buildroot}%{_datadir}/%{name}
%__cp -R web %{buildroot}%{_datadir}/%{name}/web
%__cp -R %{SOURCE2} %{buildroot}%{_datadir}/%{name}/web/themes/ondemand
%__mkdir_p %{buildroot}%{_datadir}/%{name}/web/themes/ondemand
%__tar -C %{buildroot}%{_datadir}/%{name}/web/themes/ondemand -xzf %{SOURCE2}
%__mkdir_p %{buildroot}%{_unitdir}
%__cat >> %{buildroot}%{_unitdir}/%{name}.service << EOF
[Unit]
Expand Down

0 comments on commit d3aff46

Please sign in to comment.