Skip to content

Commit

Permalink
Merge commit 'cb8b9ca7462e923e187da46e9ac3f45f55d8bf07'
Browse files Browse the repository at this point in the history
* commit 'cb8b9ca7462e923e187da46e9ac3f45f55d8bf07':
  README: fix small grammatical error (sorin-ionescu#1857)
  utility, helper: add aliases to use with termux terminal emulator (android) (sorin-ionescu#1859)
  • Loading branch information
dcato committed Jul 21, 2020
2 parents 0c42b06 + cb8b9ca commit d1850ad
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Updating

Run `zprezto-update` to automatically check if there is an update to zprezto.
If there are no file conflicts, zprezto and its submodules will be
automatically updated. If there are conflicts you will instructed to go into
automatically updated. If there are conflicts you will be instructed to go into
the `$ZPREZTODIR` directory and resolve them yourself.

To pull the latest changes and update submodules manually:
Expand Down
5 changes: 5 additions & 0 deletions modules/helper/init.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,8 @@ function is-bsd {
function is-cygwin {
[[ "$OSTYPE" == cygwin* ]]
}

# is true on termux (Android)
function is-termux {
[[ "$OSTYPE" == linux-android ]]
}
4 changes: 4 additions & 0 deletions modules/utility/init.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ elif is-cygwin; then
alias o='cygstart'
alias pbcopy='tee > /dev/clipboard'
alias pbpaste='cat /dev/clipboard'
elif is-termux; then
alias o='termux-open'
alias pbcopy='termux-clipboard-set'
alias pbpaste='termux-clipboard-get'
else
alias o='xdg-open'

Expand Down

0 comments on commit d1850ad

Please sign in to comment.