From 5750ed4d7c6c9118877865ae804c3339fafeeff3 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Thu, 27 Feb 2020 16:33:04 +0100 Subject: [PATCH 1/6] _layouts/package.html: show package distribution --- _layouts/package.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/package.html b/_layouts/package.html index 224529e..4e978d1 100644 --- a/_layouts/package.html +++ b/_layouts/package.html @@ -2,7 +2,7 @@ layout: default --- -

Package: {{ page.Name }} ({{ page.Versions.first[0] }}) [{{ page.Component }}]

+

Package: {{ page.Name }} ({{ page.Versions.first[0] }}) [{{ page.Archive }}:{{ page.Component }}]

{{ page.Description | capitalize }}

From 47115678385c82ed3938b071784547f638081663 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Thu, 27 Feb 2020 16:38:44 +0100 Subject: [PATCH 2/6] _includes/apt-add.html: make distribution variable. --- _includes/apt-add.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_includes/apt-add.html b/_includes/apt-add.html index b1b4634..554fdb4 100644 --- a/_includes/apt-add.html +++ b/_includes/apt-add.html @@ -1,5 +1,6 @@ {% assign domain = include.domain | default: site.apt.domain %} +{% assign dist = include.distribution | default: "bionic" %} {% highlight bash %} -$ sudo apt-add-repository -y 'deb [arch=amd64] https://{{ domain }}/{{ include.repo }} bionic {{ include.components }}' {% if include.update == true %} +$ sudo apt-add-repository -y 'deb [arch=amd64] https://{{ domain }}/{{ include.repo }} {{ dist }} {{ include.components }}' {% if include.update == true %} $ sudo apt-get update{% endif %} {% endhighlight %} From 65dd42a0a88eedd30d19f92918e1ed2f3dfea22e Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Fri, 28 Feb 2020 10:39:46 +0100 Subject: [PATCH 3/6] Adding _data/dists.yml --- _data/dists.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 _data/dists.yml diff --git a/_data/dists.yml b/_data/dists.yml new file mode 100644 index 0000000..6adf310 --- /dev/null +++ b/_data/dists.yml @@ -0,0 +1,6 @@ + +bionic: + version: 18.04 + +eoan: + version: 19.10 From 1e77c6d96295eb7d31ca9407af827b70b26a0108 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Fri, 28 Feb 2020 10:40:04 +0100 Subject: [PATCH 4/6] Adding _layouts/dist.html --- _layouts/dist.html | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 _layouts/dist.html diff --git a/_layouts/dist.html b/_layouts/dist.html new file mode 100644 index 0000000..61206cc --- /dev/null +++ b/_layouts/dist.html @@ -0,0 +1,48 @@ +--- +layout: default +--- + +{% assign dist = page.slug %} +{% assign repo = page.url | remove_first: '/' | split: '/' | first %} +{% assign repo_info = site.repos | where: 'repo', repo | first %} + +{% assign domain = repo_info.domain | default: site.apt.domain %} +{% assign list = site.packages | where: 'Repo', repo | where: 'Archive', dist %} + +

+ NOTE: If this is your first time here, you need to do some configurations before you can use this repository. + Please read the instructions. +

+ +

{{ repo }} - {{ dist }}

+ +

{{ repo_info.description }}

+ +{% for component in site.apt.components %} + +

{{ component }}

+{% assign packages = list | where: 'Component', component %} + +{% if packages.size > 0 %} + +{% include apt-add.html domain=domain repo=repo distribution=dist components=component %} + + + + + + + + {% for package in packages %} + + + + + + {% endfor %} +
NameDescriptionLatest Version
{{ package.Name }}{{ package.Description }}{{ package.Versions.first[0] }}
+{% else %} +

No packages

+{% endif %} + +{% endfor %} From 2ddec94e98d912551b8f28759addbcca876454b5 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Fri, 28 Feb 2020 10:40:39 +0100 Subject: [PATCH 5/6] _layouts/repo.html: modify to support multiple distributions --- _layouts/repo.html | 47 +++++++++------------------------------------- 1 file changed, 9 insertions(+), 38 deletions(-) diff --git a/_layouts/repo.html b/_layouts/repo.html index fba1a61..2a782b7 100644 --- a/_layouts/repo.html +++ b/_layouts/repo.html @@ -2,45 +2,16 @@ layout: default --- +{% assign id = page.slug %} +{% assign dists = site.packages | where: 'Repo', id | group_by: 'Archive' %} -{% assign domain = page.domain | default: site.apt.domain %} -{% assign repo = page.repo %} -{% assign list = site.packages | where: 'Repo', repo %} +

{{ page.title }} repository

-

- NOTE: If this is your first time here, you need to do some configurations before you can use this repository. - Please read the instructions. -

- -

{{ page.title }} Repository

- -

{{ page.description }}

- -{% for component in site.apt.components %} - -

{{ component }}

-{% assign packages = list | where: 'Component', component %} - -{% if packages.size > 0 %} - -{% include apt-add.html domain=domain repo=repo components=component %} - - - - - - - - {% for package in packages %} - - - - - - {% endfor %} -
NameDescriptionLatest Version
{{ package.Name }}{{ package.Description }}{{ package.Versions.first[0] }}
-{% else %} -

No packages

-{% endif %} +

Choose your ubuntu version below

+ From 99f00da3089dc9780a99cd082bc9d59138c429f3 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Fri, 28 Feb 2020 10:41:10 +0100 Subject: [PATCH 6/6] _packages: adding distribution pages --- _packages/bos/bionic.md | 4 ++++ _packages/daobet/bionic.md | 4 ++++ _packages/eosio/bionic.md | 4 ++++ _packages/main/bionic.md | 4 ++++ _packages/uos/bionic.md | 4 ++++ _packages/wax/bionic.md | 4 ++++ 6 files changed, 24 insertions(+) create mode 100644 _packages/bos/bionic.md create mode 100644 _packages/daobet/bionic.md create mode 100644 _packages/eosio/bionic.md create mode 100644 _packages/main/bionic.md create mode 100644 _packages/uos/bionic.md create mode 100644 _packages/wax/bionic.md diff --git a/_packages/bos/bionic.md b/_packages/bos/bionic.md new file mode 100644 index 0000000..fd5dc62 --- /dev/null +++ b/_packages/bos/bionic.md @@ -0,0 +1,4 @@ +--- +layout: dist +title: "bos/bionic" +--- diff --git a/_packages/daobet/bionic.md b/_packages/daobet/bionic.md new file mode 100644 index 0000000..35dc5ba --- /dev/null +++ b/_packages/daobet/bionic.md @@ -0,0 +1,4 @@ +--- +layout: dist +title: "daobet/bionic" +--- diff --git a/_packages/eosio/bionic.md b/_packages/eosio/bionic.md new file mode 100644 index 0000000..7e1daa2 --- /dev/null +++ b/_packages/eosio/bionic.md @@ -0,0 +1,4 @@ +--- +layout: dist +title: "eosio/eoan" +--- diff --git a/_packages/main/bionic.md b/_packages/main/bionic.md new file mode 100644 index 0000000..bb8d1c1 --- /dev/null +++ b/_packages/main/bionic.md @@ -0,0 +1,4 @@ +--- +layout: dist +title: "main/bionic" +--- diff --git a/_packages/uos/bionic.md b/_packages/uos/bionic.md new file mode 100644 index 0000000..c42a69c --- /dev/null +++ b/_packages/uos/bionic.md @@ -0,0 +1,4 @@ +--- +layout: dist +title: "uos/bionic" +--- diff --git a/_packages/wax/bionic.md b/_packages/wax/bionic.md new file mode 100644 index 0000000..fa6a51c --- /dev/null +++ b/_packages/wax/bionic.md @@ -0,0 +1,4 @@ +--- +layout: dist +title: "wax/bionic" +---