From ee925c993a9879cc7a375c2a2535e7e332cf160d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jun 2022 02:18:26 +0300 Subject: [PATCH] Use includes for code blocks instead of repeating in multilingual pages --- content/{korhonen_aur.adoc => korhonen_aur/index.adoc} | 6 ++---- .../{korhonen_aur.fi.adoc => korhonen_aur/index.fi.adoc} | 6 ++---- content/korhonen_aur/pacman-commands.sh | 2 ++ content/korhonen_aur/pacman.conf | 2 ++ 4 files changed, 8 insertions(+), 8 deletions(-) rename content/{korhonen_aur.adoc => korhonen_aur/index.adoc} (84%) rename content/{korhonen_aur.fi.adoc => korhonen_aur/index.fi.adoc} (85%) create mode 100644 content/korhonen_aur/pacman-commands.sh create mode 100644 content/korhonen_aur/pacman.conf diff --git a/content/korhonen_aur.adoc b/content/korhonen_aur/index.adoc similarity index 84% rename from content/korhonen_aur.adoc rename to content/korhonen_aur/index.adoc index 7b64845..393c622 100644 --- a/content/korhonen_aur.adoc +++ b/content/korhonen_aur/index.adoc @@ -39,14 +39,12 @@ First, add link:/pgp[my PGP key] to your pacman keyring and trust it [source,shell] ---- -curl 'https://korhonen.cc/pgp/marko_korhonen_gpg.asc' | sudo pacman-key -a - -sudo pacman-key --lsign-key E40A9DD549AA7A3CFCCBBC3D911B85FBC6003FE5 +include::content/korhonen_aur/pacman-commands.sh[] ---- Then add the following to your `/etc/pacman.conf` [source,shell] ---- -[korhonen_aur] -Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch +include::content/korhonen_aur/pacman.conf[] ---- diff --git a/content/korhonen_aur.fi.adoc b/content/korhonen_aur/index.fi.adoc similarity index 85% rename from content/korhonen_aur.fi.adoc rename to content/korhonen_aur/index.fi.adoc index f8789cc..bde4c34 100644 --- a/content/korhonen_aur.fi.adoc +++ b/content/korhonen_aur/index.fi.adoc @@ -37,8 +37,7 @@ avainnippuusi ja luota siihen [source,shell] ---- -curl 'https://korhonen.cc/pgp/marko_korhonen_gpg.asc' | sudo pacman-key -a - -sudo pacman-key --lsign-key E40A9DD549AA7A3CFCCBBC3D911B85FBC6003FE5 +include::content/korhonen_aur/pacman-commands.sh[] ---- Sitten lisää seuraava sisältö pacman konfiguraatioosi @@ -46,6 +45,5 @@ Sitten lisää seuraava sisältö pacman konfiguraatioosi [source,shell] ---- -[korhonen_aur] -Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch +include::content/korhonen_aur/pacman.conf[] ---- diff --git a/content/korhonen_aur/pacman-commands.sh b/content/korhonen_aur/pacman-commands.sh new file mode 100644 index 0000000..4ade520 --- /dev/null +++ b/content/korhonen_aur/pacman-commands.sh @@ -0,0 +1,2 @@ +curl 'https://korhonen.cc/pgp/marko_korhonen_gpg.asc' | sudo pacman-key -a - +sudo pacman-key --lsign-key E40A9DD549AA7A3CFCCBBC3D911B85FBC6003FE5 diff --git a/content/korhonen_aur/pacman.conf b/content/korhonen_aur/pacman.conf new file mode 100644 index 0000000..e8c4f91 --- /dev/null +++ b/content/korhonen_aur/pacman.conf @@ -0,0 +1,2 @@ +[korhonen_aur] +Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch