Key display fixed for real this time, thanks Claud.

This commit is contained in:
Storm Dragon
2025-07-29 13:25:39 -04:00
parent f53cc37722
commit e9ab8625bf
+8 -4
View File
@@ -1623,7 +1623,8 @@ EOF
exit; exit;
} }
# run the wizard, which writes a keyfile for us # run the wizard, which writes a keyfile for us
# keyfile is already set correctly from command line or default # restore keyfile path from attempted_keyfile for wizard use
$keyfile = $attempted_keyfile;
print $stdout <<"EOF"; print $stdout <<"EOF";
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@@ -1641,7 +1642,8 @@ you use with TTYverse; only one account token can be stored per keyfile. If you
have multiple accounts, use -keyfile=... to specify different keyfiles. KEEP THESE have multiple accounts, use -keyfile=... to specify different keyfiles. KEEP THESE
FILES SECRET. FILES SECRET.
** This wizard will overwrite $keyfile ** This wizard will overwrite $attempted_keyfile
** (Use -keyfile=path to specify a different location)
Press RETURN/ENTER to continue or CTRL-C NOW! to abort. Press RETURN/ENTER to continue or CTRL-C NOW! to abort.
EOF EOF
$j = <STDIN>; $j = <STDIN>;
@@ -1736,8 +1738,10 @@ EOF
} }
} # end OAuth 1.0a else block } # end OAuth 1.0a else block
} }
} elsif ($retoke && length($keyfile)) { } elsif ($retoke && length($attempted_keyfile)) {
# start the "re-toke" wizard to convert DM-less cloned app keys. # start the "re-toke" wizard to convert DM-less cloned app keys.
# restore keyfile path from attempted_keyfile for wizard use
$keyfile = $attempted_keyfile;
# dup STDIN for systems that can only "close" it once # dup STDIN for systems that can only "close" it once
open(STDIN2, "<&STDIN") || die("couldn't dup STDIN: $!\n"); open(STDIN2, "<&STDIN") || die("couldn't dup STDIN: $!\n");
print $stdout <<"EOF"; print $stdout <<"EOF";
@@ -1761,7 +1765,7 @@ You SHOULD NOT need this wizard if your app key was cloned after 1 June 2011.
However, you can still use it if you experience this specific issue with DMs, However, you can still use it if you experience this specific issue with DMs,
or need to rebuild your keyfile for any other reason. or need to rebuild your keyfile for any other reason.
** This wizard will overwrite the key at $keyfile ** This wizard will overwrite the key at $attempted_keyfile
** To change this, restart TTYverse with -retoke -keyfile=/path/to/keyfile ** To change this, restart TTYverse with -retoke -keyfile=/path/to/keyfile
Press RETURN/ENTER to continue, or CTRL-C NOW! to abort. Press RETURN/ENTER to continue, or CTRL-C NOW! to abort.
EOF EOF