Skip to content

Commit

Permalink
Merge pull request #385 from waterkip/fresh-install-debian-testing
Browse files Browse the repository at this point in the history
Set action on lpass help preventing a fallthrough (fixes #386)
  • Loading branch information
rutkai authored May 17, 2018
2 parents 6a941d6 + 8686f64 commit 627a06e
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# EditorConfig is awesome: http://EditorConfig.org
root = true

[*]
end_of_line = lf
insert_final_newline = true
indent_style = tab
indent_size = 4
charset = utf-8
24 changes: 22 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,33 @@ sudo yum install openssl libcurl libxml2 pinentry xclip openssl-devel libxml2-de
* For Debian:

```
sudo apt-get install openssl libcurl3 libxml2 libssl-dev libxml2-dev libcurl4-openssl-dev pinentry-curses xclip build-essential
sudo apt install --no-install-recommends \
build-essential \
cmake \
libcurl3 \
libcurl4-openssl-dev \
libssl-dev \
libxml2 \
libxml2-dev \
openssl \
pinentry-curses \
pkg-config \
xclip
```

* For Ubuntu:

```
sudo apt-get install openssl libcurl4-openssl-dev libxml2 libssl-dev libxml2-dev pinentry-curses xclip cmake build-essential pkg-config
sudo apt install --no-install-recommends \
cmake \
libcurl4-openssl-dev \
libssl-dev \
libxml2 \
libxml2-dev \
openssl \
pinentry-curses \
pkg-config \
xclip
```

#### Gentoo
Expand Down
2 changes: 2 additions & 0 deletions lpass.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ static int global_options(int argc, char *argv[])
case 'h':
version();
printf("\n");
help();
return 0;
case '?':
help();
return option == 'h';
Expand Down

0 comments on commit 627a06e

Please sign in to comment.