Skip to content

Commit 5a09d4a

Browse files
committed
Merge branch 'augensalat-master' (Updated RPM Spec)
Fixes #87
2 parents a4a7902 + ecb1fd9 commit 5a09d4a

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,10 @@ from scratch by following this procedure:
260260
* Run the following command to create a tarball:
261261

262262
````sh
263-
VER1=$(git describe)
263+
VER=$(git describe)
264264
# replace dash with underscore to work around
265265
# rpmbuild does not allow dash in version string
266-
VER=${VER1//\-/_}
266+
VER=${VER//\-/_}
267267
git archive \
268268
--format tar \
269269
--prefix=bash-git-prompt-${VER}/ \
@@ -272,6 +272,7 @@ from scratch by following this procedure:
272272
*.py \
273273
*.fish \
274274
README.md \
275+
themes \
275276
> bash-git-prompt-${VER}.tar
276277
mkdir -p /tmp/bash-git-prompt-${VER}
277278
sed "s/Version:.*/Version: ${VER}/" \
@@ -317,4 +318,4 @@ I accept tips through [Gittip][tip] and [Flattr][flattr].
317318
[license]:https://github.com/magicmonty/bash-git-prompt/tree/master/LICENSE.txt
318319
[flattr]: https://flattr.com/submit/auto?user_id=magicmonty&url=https%3A%2F%2Fgithub.com%2Fmagicmonty%2Fbash-git-prompt
319320
[homebrew]: http://brew.sh/
320-
[upforgrabs]: https://github.com/magicmonty/bash-git-prompt/labels/up-for-grabs
321+
[upforgrabs]: https://github.com/magicmonty/bash-git-prompt/labels/up-for-grabs

bash-git-prompt.spec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ install -pm 755 *.sh %{buildroot}%{_datadir}/%{name}
3434
install -pm 755 *.py %{buildroot}%{_datadir}/%{name}
3535
install -pm 755 *.fish %{buildroot}%{_datadir}/%{name}
3636
install -pm 644 README.md %{buildroot}%{_datadir}/%{name}
37+
install -d 755 %{buildroot}%{_datadir}/%{name}/themes
38+
install -pm 644 themes/*.bgptheme %{buildroot}%{_datadir}/%{name}/themes
39+
install -pm 644 themes/*.bgptemplate %{buildroot}%{_datadir}/%{name}/themes
3740

3841
# never include compiled Python program
3942
rm -fr %{buildroot}%{_datadir}/%{name}/*.pyo
@@ -57,6 +60,7 @@ if [ -f %{_datadir}/%{name}/gitprompt.sh ]; then
5760
# Set config variables first
5861
5962
GIT_PROMPT_ONLY_IN_REPO=1
63+
GIT_PROMPT_THEME=Default
6064
source %{_datadir}/%{name}/gitprompt.sh
6165
fi
6266
%{END_TOKEN}

0 commit comments

Comments
 (0)