From 6054395918599eb3a8a817f345ad31c4878cc409 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Thu, 9 Jan 2020 23:28:48 +0100
Subject: [PATCH] Fix issues more

Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
---
 .github/workflows/fedora-31-kernel-surface.yml  |   4 ++--
 pkg/{secret => secrets}/.gitignore              |   0
 pkg/{secret => secrets}/decrypt.sh              |   0
 pkg/{secret => secrets}/gpg/surface_gpg.asc     |   0
 pkg/{secret => secrets}/gpg/surface_gpg.key.gpg | Bin
 pkg/{secret => secrets}/sb/surface_sb.cer       | Bin
 pkg/{secret => secrets}/sb/surface_sb.crt       |   0
 pkg/{secret => secrets}/sb/surface_sb.key.gpg   | Bin
 8 files changed, 2 insertions(+), 2 deletions(-)
 rename pkg/{secret => secrets}/.gitignore (100%)
 rename pkg/{secret => secrets}/decrypt.sh (100%)
 rename pkg/{secret => secrets}/gpg/surface_gpg.asc (100%)
 rename pkg/{secret => secrets}/gpg/surface_gpg.key.gpg (100%)
 rename pkg/{secret => secrets}/sb/surface_sb.cer (100%)
 rename pkg/{secret => secrets}/sb/surface_sb.crt (100%)
 rename pkg/{secret => secrets}/sb/surface_sb.key.gpg (100%)

diff --git a/.github/workflows/fedora-31-kernel-surface.yml b/.github/workflows/fedora-31-kernel-surface.yml
index 5d3e9c066..4050b6732 100644
--- a/.github/workflows/fedora-31-kernel-surface.yml
+++ b/.github/workflows/fedora-31-kernel-surface.yml
@@ -13,8 +13,8 @@ jobs:
       env:
         LS_PASSWORD: ${{ secrets.LS_PASSWORD }}
       run: |
-        ./pkg/secrets/decrypt.sh -p "$LS_PASSWORD" -f pkg/secrets/gpg/surface_gpg.key.gpg
-        ./pkg/secrets/decrypt.sh -p "$LS_PASSWORD" -f pkg/secrets/sb/surface_sb.key.gpg
+        pkg/secrets/decrypt.sh -p "$LS_PASSWORD" -f pkg/secrets/gpg/surface_gpg.key.gpg
+        pkg/secrets/decrypt.sh -p "$LS_PASSWORD" -f pkg/secrets/sb/surface_sb.key.gpg
     - name: Install certificates
       run: |
         gpg --quiet --no-tty --batch --yes --import pkg/secrets/gpg/surface_gpg.key
diff --git a/pkg/secret/.gitignore b/pkg/secrets/.gitignore
similarity index 100%
rename from pkg/secret/.gitignore
rename to pkg/secrets/.gitignore
diff --git a/pkg/secret/decrypt.sh b/pkg/secrets/decrypt.sh
similarity index 100%
rename from pkg/secret/decrypt.sh
rename to pkg/secrets/decrypt.sh
diff --git a/pkg/secret/gpg/surface_gpg.asc b/pkg/secrets/gpg/surface_gpg.asc
similarity index 100%
rename from pkg/secret/gpg/surface_gpg.asc
rename to pkg/secrets/gpg/surface_gpg.asc
diff --git a/pkg/secret/gpg/surface_gpg.key.gpg b/pkg/secrets/gpg/surface_gpg.key.gpg
similarity index 100%
rename from pkg/secret/gpg/surface_gpg.key.gpg
rename to pkg/secrets/gpg/surface_gpg.key.gpg
diff --git a/pkg/secret/sb/surface_sb.cer b/pkg/secrets/sb/surface_sb.cer
similarity index 100%
rename from pkg/secret/sb/surface_sb.cer
rename to pkg/secrets/sb/surface_sb.cer
diff --git a/pkg/secret/sb/surface_sb.crt b/pkg/secrets/sb/surface_sb.crt
similarity index 100%
rename from pkg/secret/sb/surface_sb.crt
rename to pkg/secrets/sb/surface_sb.crt
diff --git a/pkg/secret/sb/surface_sb.key.gpg b/pkg/secrets/sb/surface_sb.key.gpg
similarity index 100%
rename from pkg/secret/sb/surface_sb.key.gpg
rename to pkg/secrets/sb/surface_sb.key.gpg