mirror of https://github.com/ohmyzsh/ohmyzsh.git
Compare commits
5 Commits
0ad600ca6f
...
54fbde5281
Author | SHA1 | Date |
---|---|---|
Angelos Michalopoulos | 54fbde5281 | |
dependabot[bot] | 6e9cda3d30 | |
ohmyzsh[bot] | d689aa289e | |
Felipe Contreras | 8c5b71b2f4 | |
Angelos Michalopoulos | 6cbc8e707c |
|
@ -2,11 +2,13 @@ dependencies:
|
|||
plugins/gitfast:
|
||||
repo: felipec/git-completion
|
||||
branch: master
|
||||
version: tag:v2.1
|
||||
version: tag:v2.2
|
||||
postcopy: |
|
||||
set -e
|
||||
rm -rf git-completion.plugin.zsh Makefile README.adoc t tools
|
||||
test -e git-completion.zsh && mv -f git-completion.zsh _git
|
||||
rm -rf git-completion.plugin.zsh Makefile t tools
|
||||
mv README.adoc MANUAL.adoc
|
||||
mv -f src/* .
|
||||
rmdir src
|
||||
plugins/gradle:
|
||||
repo: gradle/gradle-completion
|
||||
branch: master
|
||||
|
|
|
@ -3,5 +3,5 @@ charset-normalizer==3.4.1
|
|||
idna==3.10
|
||||
PyYAML==6.0.2
|
||||
requests==2.32.3
|
||||
semver==3.0.2
|
||||
semver==3.0.3
|
||||
urllib3==2.3.0
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
## apple-passwords-otp
|
||||
|
||||
This plugin adds a function that allows to quickly copy the One-Time-Password (OTP) for a specific domain from
|
||||
Apple Passwords to the clipboard.
|
||||
|
||||
To use it, add `apple-passwords-otp` to the plugins array of your zshrc file:
|
||||
|
||||
```zsh
|
||||
plugins=(... apple-passwords-otp)
|
||||
```
|
||||
|
||||
## Functions
|
||||
|
||||
- `otp(domain)` : copies the OTP for the specified domain to the clipboard
|
||||
|
||||
## Usage
|
||||
|
||||
```bash
|
||||
otp domain
|
||||
```
|
||||
|
||||
## Requirements
|
||||
|
||||
This plugin depends on the [Apple Passwords CLI](https://github.com/bendews/apw) tool. It can be installed via
|
||||
Homebrew. Other requirements are `jq` to parse json files which can be installed via Homebrew as well. You
|
||||
need to have Mac OS Sequoia or later to use this plugin.
|
|
@ -0,0 +1,37 @@
|
|||
function otp() {
|
||||
if [ -z "$1" ]; then
|
||||
echo "Usage: otp <domain>"
|
||||
return 1
|
||||
fi
|
||||
if ! command -v apw &> /dev/null || ! command -v jq &> /dev/null || ! command -v awk &> /dev/null; then
|
||||
echo "This function requires apw, jq and awk to be installed"
|
||||
return 1
|
||||
fi
|
||||
CODES=$(apw otp get $1 2>/dev/null)
|
||||
STATUS=$?
|
||||
# ✋ If return code 9, not authenticated, run apw auth
|
||||
if [ $STATUS -eq 9 ]; then
|
||||
echo "🔐 Authenticating …"
|
||||
apw auth
|
||||
CODES=$(apw otp get $1)
|
||||
fi
|
||||
# ✋ If return code 3, domain not found, alert user
|
||||
if [ $STATUS -eq 3 ]; then
|
||||
echo "🚫 Domain not found"
|
||||
return 1
|
||||
fi
|
||||
# Grab available OTP codes for domain
|
||||
if [ $(echo $CODES | jq '.results | length') -gt 1 ]; then
|
||||
echo 'Multiple OTP codes found, select username:'
|
||||
echo $CODES | jq -r '.results | to_entries[] | "\(.key + 1). \(.value.username)"'
|
||||
read -k 1 index
|
||||
echo
|
||||
CODE=$(echo $CODES | jq -r ".results[$index - 1].code")
|
||||
tput cuu $(echo $CODES | jq '.results | length' | awk '{print $1 + 2}')
|
||||
tput ed
|
||||
else
|
||||
CODE=$(echo $CODES | jq -r '.results[0].code')
|
||||
fi
|
||||
echo $CODE | pbcopy
|
||||
echo "🔑 OTP code copied to clipboard"
|
||||
}
|
|
@ -0,0 +1,40 @@
|
|||
This project is a friendly fork of the official Git completion
|
||||
(`contrib/completion`) and prompt scripts for Bash, Zsh, and possibly other
|
||||
shells.
|
||||
|
||||
Most Git developers use the Bash shell, for which the completion scripts work
|
||||
rather well, however, Zsh is typically neglected. I've sent many patches to fix
|
||||
the issues, many have been merged, but many have been ignored, thus the need for
|
||||
a canonical location of a good, working Zsh completion.
|
||||
|
||||
There are advantages for Bash users too. Currently the scripts under `contrib` are tied to the
|
||||
specific Git version, for example the completion scripts of version v2.40
|
||||
(https://git.kernel.org/pub/scm/git/git.git/plain/contrib/completion/git-completion.bash?h=v2.40.0[git-completion.bash])
|
||||
have issues with older versions of Git (e.g. v2.33); the ones in
|
||||
this project don't.
|
||||
|
||||
With `git-completion` you can be sure you are using the latest completion that
|
||||
works in both shells, and any Git version.
|
||||
|
||||
This is a sister project of the
|
||||
https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/gitfast[Oh My Zsh
|
||||
gitfast] plugin (that I also maintain), which has similar needs.
|
||||
|
||||
== Installation ==
|
||||
|
||||
* https://github.com/felipec/git-completion/wiki/Bash[Bash instructions]
|
||||
* https://github.com/felipec/git-completion/wiki/Zsh[Zsh instructions]
|
||||
|
||||
== Improvements from upstream ==
|
||||
|
||||
This is a short list of the benefits you get:
|
||||
|
||||
* Easier installation
|
||||
* Tons of bug fixes
|
||||
* Works with older versions of git
|
||||
* Zsh: much more options
|
||||
* Zsh: quoting works properly
|
||||
* Zsh: automatic suffix removal
|
||||
|
||||
For a full list of all the patches on top of upstream git check
|
||||
https://github.com/felipec/git-completion/wiki/Patches[Patches].
|
|
@ -2,23 +2,11 @@
|
|||
|
||||
# zsh completion wrapper for git
|
||||
#
|
||||
# Copyright (c) 2012-2020 Felipe Contreras <felipe.contreras@gmail.com>
|
||||
# Copyright (c) 2012-2024 Felipe Contreras <felipe.contreras@gmail.com>
|
||||
#
|
||||
# The recommended way to install this script is to make a copy of it as a
|
||||
# file named '_git' inside any directory in your fpath.
|
||||
# The recommended way to use this script is to prepend its location to your $fpath:
|
||||
#
|
||||
# For example, create a directory '~/.zsh/', copy this file to '~/.zsh/_git',
|
||||
# and then add the following to your ~/.zshrc file:
|
||||
#
|
||||
# fpath=(~/.zsh $fpath)
|
||||
#
|
||||
# You need git's bash completion script installed. By default bash-completion's
|
||||
# location will be used (e.g. pkg-config --variable=completionsdir bash-completion).
|
||||
#
|
||||
# If your bash completion script is somewhere else, you can specify the
|
||||
# location in your ~/.zshrc:
|
||||
#
|
||||
# zstyle ':completion:*:*:git:*' script ~/.git-completion.bash
|
||||
# fpath=($git_completion_srcdir $fpath)
|
||||
#
|
||||
|
||||
zstyle -T ':completion:*:*:git:*' tag-order && \
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
# bash/zsh completion support for core Git.
|
||||
#
|
||||
# Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
|
||||
# Copyright (c) 2012-2024 Felipe Contreras <felipe.contreras@gmail.com>
|
||||
#
|
||||
# Conceptually based on gitcompletion (http://gitweb.hawaga.org.uk/).
|
||||
# Distributed under the GNU General Public License, version 2.0.
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue