From 8ac12ebf439d4ab6814e3089bae7eee71f4c1cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?= Date: Mon, 14 Sep 2020 21:32:18 -0700 Subject: [PATCH] Enable secretservice on non-linux systems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is nothing linux specific about secretservice. I was able to build it on openbsd with this change. Signed-off-by: Rafael Ávila de Espíndola --- Makefile | 2 +- secretservice/cmd/{main_linux.go => main.go} | 0 secretservice/{secretservice_linux.c => secretservice.c} | 2 +- secretservice/{secretservice_linux.go => secretservice.go} | 2 +- secretservice/{secretservice_linux.h => secretservice.h} | 0 .../{secretservice_linux_test.go => secretservice_test.go} | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename secretservice/cmd/{main_linux.go => main.go} (100%) rename secretservice/{secretservice_linux.c => secretservice.c} (99%) rename secretservice/{secretservice_linux.go => secretservice.go} (99%) rename secretservice/{secretservice_linux.h => secretservice.h} (100%) rename secretservice/{secretservice_linux_test.go => secretservice_test.go} (100%) diff --git a/Makefile b/Makefile index 1eb9f08c..67a5cbed 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ osxcodesign: osxkeychain secretservice: mkdir -p bin - go build -o bin/docker-credential-secretservice secretservice/cmd/main_linux.go + go build -o bin/docker-credential-secretservice secretservice/cmd/main.go pass: mkdir -p bin diff --git a/secretservice/cmd/main_linux.go b/secretservice/cmd/main.go similarity index 100% rename from secretservice/cmd/main_linux.go rename to secretservice/cmd/main.go diff --git a/secretservice/secretservice_linux.c b/secretservice/secretservice.c similarity index 99% rename from secretservice/secretservice_linux.c rename to secretservice/secretservice.c index 73502a2e..676cddb2 100644 --- a/secretservice/secretservice_linux.c +++ b/secretservice/secretservice.c @@ -1,6 +1,6 @@ #include #include -#include "secretservice_linux.h" +#include "secretservice.h" const SecretSchema *docker_get_schema(void) { diff --git a/secretservice/secretservice_linux.go b/secretservice/secretservice.go similarity index 99% rename from secretservice/secretservice_linux.go rename to secretservice/secretservice.go index 26efc0d1..9a837ea5 100644 --- a/secretservice/secretservice_linux.go +++ b/secretservice/secretservice.go @@ -3,7 +3,7 @@ package secretservice /* #cgo pkg-config: libsecret-1 -#include "secretservice_linux.h" +#include "secretservice.h" #include */ import "C" diff --git a/secretservice/secretservice_linux.h b/secretservice/secretservice.h similarity index 100% rename from secretservice/secretservice_linux.h rename to secretservice/secretservice.h diff --git a/secretservice/secretservice_linux_test.go b/secretservice/secretservice_test.go similarity index 100% rename from secretservice/secretservice_linux_test.go rename to secretservice/secretservice_test.go