max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-23 06:26:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9307 from flox/tomberek.nix_key_newline

Browse source 
nix key: no need for progressBar
This commit is contained in:
Eelco Dolstra 2023-11-16 15:05:34 +01:00 committed by GitHub
commit 16c052e4e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nix/cat.cc
View file

@ -1,6 +1,7 @@
#include "command.hh" #include "command.hh"
#include "store-api.hh" #include "store-api.hh"
#include "nar-accessor.hh" #include "nar-accessor.hh"
#include "progress-bar.hh"
using namespace nix; using namespace nix;
@ -13,6 +14,7 @@ struct MixCat : virtual Args
auto st = accessor->lstat(CanonPath(path)); auto st = accessor->lstat(CanonPath(path));
if (st.type != SourceAccessor::Type::tRegular) if (st.type != SourceAccessor::Type::tRegular)
throw Error("path '%1%' is not a regular file", path); throw Error("path '%1%' is not a regular file", path);
stopProgressBar();
writeFull(STDOUT_FILENO, accessor->readFile(CanonPath(path))); writeFull(STDOUT_FILENO, accessor->readFile(CanonPath(path)));
} }
}; };

3
src/nix/sigs.cc
View file

@ -3,6 +3,7 @@
#include "shared.hh" #include "shared.hh"
#include "store-api.hh" #include "store-api.hh"
#include "thread-pool.hh" #include "thread-pool.hh"
#include "progress-bar.hh"
#include <atomic> #include <atomic>
@ -174,6 +175,7 @@ struct CmdKeyGenerateSecret : Command
if (!keyName) if (!keyName)
throw UsageError("required argument '--key-name' is missing"); throw UsageError("required argument '--key-name' is missing");
stopProgressBar();
writeFull(STDOUT_FILENO, SecretKey::generate(*keyName).to_string()); writeFull(STDOUT_FILENO, SecretKey::generate(*keyName).to_string());
} }
}; };
@ -195,6 +197,7 @@ struct CmdKeyConvertSecretToPublic : Command
void run() override void run() override
{ {
SecretKey secretKey(drainFD(STDIN_FILENO)); SecretKey secretKey(drainFD(STDIN_FILENO));
stopProgressBar();
writeFull(STDOUT_FILENO, secretKey.toPublicKey().to_string()); writeFull(STDOUT_FILENO, secretKey.toPublicKey().to_string());
} }
}; };