maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix/libutil): Replace hasPrefix/Suffix with Abseil

Browse source 
Uses the equivalent absl::StartsWith and absl::EndsWith functions
instead.
This commit is contained in:
Vincent Ambo 2020-05-25 02:19:01 +01:00
parent 8cf1322a6f
commit b99b368d17
21 changed files with 69 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc vendored
View file

@ -1,5 +1,6 @@
#include <iostream>
#include <absl/strings/match.h>
#include <fcntl.h>
#include <glog/logging.h>
#include <sys/stat.h>
@ -51,7 +52,8 @@ std::string resolveMirrorUri(EvalState& state, std::string uri) {
std::string mirror =
state.forceString(*mirrorList->second.value->listElems()[0]);
return mirror + (hasSuffix(mirror, "/") ? "" : "/") + std::string(s, p + 1);
return mirror + (absl::EndsWith(mirror, "/") ? "" : "/") +
std::string(s, p + 1);
}
static int _main(int argc, char** argv) {
@ -203,7 +205,7 @@ static int _main(int argc, char** argv) {
LOG(INFO) << "unpacking...";
Path unpacked = (Path)tmpDir + "/unpacked";
createDirs(unpacked);
if (hasSuffix(baseNameOf(uri), ".zip")) {
if (absl::EndsWith(baseNameOf(uri), ".zip")) {
runProgram("unzip", true, {"-qq", tmpFile, "-d", unpacked});
} else {
// FIXME: this requires GNU tar for decompression.