Skip to content

Fix duplicate .pub suffix if the file already has one #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agnosticlines wants to merge 1 commit into
base: release
Choose a base branch
from
Open

Fix duplicate .pub suffix if the file already has one #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions github-keygen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10191,7 +10191,8 @@ if (@github_accounts) {

foreach my $user (@github_accounts) {
my $u = $github_accounts{$user};
my $pub_key_file = $u->{key_file} . ".pub";
# only append ".pub" if it's not already there
my $pub_key_file = $u->{key_file} =~ /\.pub$/ ? $u->{key_file} : $u->{key_file}.".pub";
if (-e $pub_key_file) {
if (open my $f, '-|', qw<ssh-keygen -l -f>, $pub_key_file) {
chomp(my $fingerprint = <$f>);
Expand Down Expand Up @@ -10596,7 +10597,7 @@ if (@unregistered_users) {
if (@clip_cmd && @unregistered_users == 1 && !$offline) {
my $user = shift @unregistered_users;
# Copy the first key created to the clipboard
my $pub_key_file = $github_accounts{$user}->{key_file}.".pub";
my $pub_key_file = $github_accounts{$user}->{key_file} =~ /\.pub$/ ? $github_accounts{$user}->{key_file} : $github_accounts{$user}->{key_file}.".pub";
# Read the public key from the file
open my $pub, '<', $pub_key_file;
my $pubkey = <$pub>;
Expand All @@ -10616,7 +10617,8 @@ if (@unregistered_users) {
. "<https://github.com/settings/keys>.\n";
# Help the user to copy the other keys
foreach my $user (@unregistered_users) {
my $pub_key = compress_path($github_accounts{$user}{key_file}).".pub";
my $key_path = compress_path($github_accounts{$user}{key_file});
my $pub_key = $key_path =~ /\.pub$/ ? $key_path : $key_path.".pub";
if (@clip_cmd) {
print " $user: @clip_cmd < $pub_key\n";
} else {
Expand Down