Skip to content

Commit

Permalink
Merge pull request github#8652 from github/repo-sync
Browse files Browse the repository at this point in the history 
repo sync
  • Loading branch information
@Octomerger
Octomerger authored Jul 29, 2021
2 parents 74cb15f + ddcf896 commit 4ca3710
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 63 deletions.
2 changes: 1 addition & 1 deletion ...ing-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ agent_start () {

agent_load_env

# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running
# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running
agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?)

if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
Expand Down
15 changes: 0 additions & 15 deletions ...ing-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ env=~/.ssh/agent.env

agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; }

agent_start () {
(umask 077; ssh-agent >| "$env")
. env=~/.ssh/agent.env

agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; }

agent_start () {
(umask 077; ssh-agent >| "$env")
. "$env" >| /dev/null ; }
Expand All @@ -64,15 +58,6 @@ elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then
ssh-add
fi

unset env

if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
agent_start
ssh-add
elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then
ssh-add
fi

unset env
```

Expand Down
11 changes: 1 addition & 10 deletions ...ing-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ agent_start () {

agent_load_env

# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running
# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running
agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?)

if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
Expand All @@ -58,15 +58,6 @@ elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then
ssh-add
fi

unset env

if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
agent_start
ssh-add
elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then
ssh-add
fi

unset env
```

Expand Down
11 changes: 1 addition & 10 deletions ...ing-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ agent_start () {

agent_load_env

# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running
# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running
agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?)

if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
Expand All @@ -58,15 +58,6 @@ elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then
ssh-add
fi

unset env

if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
agent_start
ssh-add
elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then
ssh-add
fi

unset env
```

Expand Down
13 changes: 7 additions & 6 deletions ...ing-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,21 @@ agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; }

agent_start () {
(umask 077; ssh-agent >| "$env")
. env=~/.ssh/agent.env
. "$env" >| /dev/null ; }

agent_load_env () { test -f "$env" && .
agent_load_env

"$env" >| /dev/null ; }
# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running
agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?)

agent_start () {
(umask 077; ssh-agent >| "$env")
. "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
agent_start
ssh-add
elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then
ssh-add
fi

unset env
```

秘密鍵がデフォルトの場所 (`~/.ssh/id_rsa` など) に保存されていない場合は、SSH 認証エージェントにその場所を指定する必要があります。 キーを ssh-agent に追加するには、`ssh-add ~/path/to/my_key` と入力します。 詳細は「[新しい SSH キーを生成して ssh-agent に追加する](/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/)」を参照してください。
Expand Down
2 changes: 1 addition & 1 deletion ...ing-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ agent_start () {

agent_load_env

# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running
# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running
agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?)

if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
Expand Down
4 changes: 1 addition & 3 deletions ...ing-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,9 @@ agent_start () {

agent_load_env

# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running
# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running
agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?)

if [ !

if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
agent_start
ssh-add
Expand Down
2 changes: 1 addition & 1 deletion ...ing-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ agent_start () {

agent_load_env

# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running
# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running
agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?)

if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
Expand Down
17 changes: 1 addition & 16 deletions ...ing-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,13 @@ env=~/.ssh/agent.env

agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; }

agent_start () {
(umask 077; ssh-agent >| "$env")
. env=~/.ssh/agent.env

agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; }

agent_start () {
(umask 077; ssh-agent >| "$env")
. "$env" >| /dev/null ; }

agent_load_env

# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running
# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running
agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?)

if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
Expand All @@ -64,15 +58,6 @@ elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then
ssh-add
fi

unset env

if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
agent_start
ssh-add
elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then
ssh-add
fi

unset env
```

Expand Down

0 comments on commit 4ca3710

Please sign in to comment.