Skip to content

Commit bb5fa35

Browse files
committed
Version 0.2.3 - Bugfixes
Merge branch 'develop'
2 parents 5076b8c + cb6495d commit bb5fa35

File tree

9 files changed

+33
-21
lines changed

9 files changed

+33
-21
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ priv
77
*.beam
88
*.plt
99
*~
10-
.DS_Store
10+
.rebar
11+
.DS_Store
12+
backup/

CONTRIBUTORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
Pedram Nimreezi <deadzen@deadzen.com>
22
Uwe Dauernheim <uwe@dauernheim.net>
3+
Dylan MacKenzie <dylanmackenzie@gmail.com>
4+
Julien Barbot

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ all: compile
99

1010
test: compile ct
1111

12-
compile:
12+
compile:
1313
@$(REBAR) compile
1414

1515
clean:
@@ -19,26 +19,26 @@ clean:
1919
@rm -rf logs
2020
@rm -rf priv/*
2121
ct:
22-
@$(REBAR) ct suites=kjell_profile,kjell_extension
22+
@$(REBAR) -v ct suites=kjell_profile,kjell_extension
2323

2424
configure:
2525
@rm -rf priv/prefix
2626
ifdef PREFIX
2727
@echo "Setting installation dir to ${PREFIX}"
2828
@mkdir -p priv
2929
@echo ${PREFIX} > priv/prefix
30-
endif
30+
endif
3131

3232
install:
3333
@echo "Installing in ${INSTALL_DIR}"
3434
@mkdir -p ${INSTALL_DIR}
3535
@cp -R * ${INSTALL_DIR}
36-
@sed -i .bak "s|^EBIN_DIR=\(.*\)|EBIN_DIR=${INSTALL_DIR}/ebin|" ${INSTALL_DIR}/bin/kjell && rm ${INSTALL_DIR}/bin/kjell.bak
36+
@sed -i'.bak' "s|^EBIN_DIR=\(.*\)|EBIN_DIR=${INSTALL_DIR}/ebin|" ${INSTALL_DIR}/bin/kjell && rm ${INSTALL_DIR}/bin/kjell.bak
3737
ifndef NO_SYMLINK
3838
@echo "Creatink symbolic link ${BIN_DIR}/kjell -> ${INSTALL_DIR}/bin/kjell"
3939
@ln -sf ${INSTALL_DIR}/bin/kjell ${BIN_DIR}/kjell
4040
endif
4141

4242
install-extensions:
4343
@mkdir -p ${CFG_DIR}
44-
@cp -R ext/extensions ${CFG_DIR}
44+
@cp -R ext/extensions ${CFG_DIR}

README.md

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Kjell
22
=====
33

4-
Kjell - a refurbished Erlang shell with support for color profiles and extensions.
4+
Kjell - a refurbished Erlang shell with support for color profiles and extensions.
55

66
## Screens
77

@@ -54,9 +54,9 @@ If installed, execute `kjell` in terminal, otherwise, `<build_dir>/bin/kjell`
5454
## Extensions
5555

5656
Install extensions in user directory:
57-
~~~
57+
~~~
5858
$ make install-extensions
59-
~~~
59+
~~~
6060

6161
See https://github.com/karlll/kjell-extensions for further information about extensions.
6262

@@ -72,10 +72,22 @@ karlll, <karl@ninjacontrol.com>
7272

7373
* Pedram Nimreezi <deadzen@deadzen.com>
7474
* Uwe Dauernheim <uwe@dauernheim.net>
75+
* Dylan MacKenzie <dylanmackenzie@gmail.com>
76+
* Julien Barbot
77+
78+
## How to contribute
79+
80+
Got new features, bugfixes, extensions? Great! Please do the following:
81+
82+
* Clone the repo
83+
* Check out the development branch
84+
* Hack stuff
85+
* Add yourself to the CONTRIBUTORs
86+
* Submit your pull request to the development branch
87+
88+
If appropriate, please extend the current test suites or add new ones.
7589

7690
## Build status
7791

7892
* Main branch : [![Build Status](https://travis-ci.org/karlll/kjell.png?branch=master)](https://travis-ci.org/karlll/kjell)
7993
* Development branch : [![Build Status](https://travis-ci.org/karlll/kjell.png?branch=develop)](https://travis-ci.org/karlll/kjell)
80-
81-

bin/kjell

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33

44
SCRIPT_DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
55
EBIN_DIR="${SCRIPT_DIR}/../ebin"
6-
76
erl -noinput -pa ${EBIN_DIR} -run start_kjell $@

include/kjell.hrl

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
%%% @end
55

66

7-
-define(VERSION,"0.2.2").
7+
-define(VERSION,"0.2.3").
88
-define(BANNER,"Kjell v." ++ ?VERSION).
99

1010
-define(DEFAULT_COLORS,
11-
[
12-
%% Text classes
11+
[
12+
%% Text classes
1313
%% { class, {text_attrib, foreground, background}}
1414

1515
% shell
@@ -21,7 +21,7 @@
2121
{info,{none,white,none}},
2222

2323

24-
24+
2525
% types
2626
{string,{none,yellow,none}},
2727
{digits,{none,green,none}},
@@ -86,6 +86,3 @@
8686

8787
% log level
8888
-define(LL,?LL_INFO).
89-
90-
91-

rebar

40.3 KB
Binary file not shown.

src/kjell.app.src

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{application, kjell,
22
[
33
{description, "An erlang shell"},
4-
{vsn, "0.2.22"},
4+
{vsn, "0.2.3"},
55
{registered, []},
66
{applications, [
77
kernel,

0 commit comments

Comments
 (0)