From c15824a82c108ccb9b34d5d251107c656afe03e3 Mon Sep 17 00:00:00 2001 From: hainenber Date: Thu, 7 Sep 2023 23:00:21 +0700 Subject: [PATCH 1/4] feat(doc): redirect to install doc page instead of brief summary --- templates/base.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/base.html b/templates/base.html index 38602401..55c71d52 100644 --- a/templates/base.html +++ b/templates/base.html @@ -6,6 +6,8 @@ + + {% block head %} {{ os_family | capitalize}} {{product_name | capitalize }} Packages {% endblock %} From f653b331d40aa8d982dcc0808dc8ad64d126103e Mon Sep 17 00:00:00 2001 From: hainenber Date: Sat, 9 Sep 2023 00:08:22 +0700 Subject: [PATCH 2/4] feat(template): keep only URL redirecting instruction --- templates/base.html | 1 - templates/header.debian.html | 55 ++++-------------------- templates/header.msi.html | 15 ++++--- templates/header.opensuse.html | 31 ++++---------- templates/header.redhat.html | 39 ++++------------- templates/header.war.html | 77 ++++------------------------------ 6 files changed, 36 insertions(+), 182 deletions(-) diff --git a/templates/base.html b/templates/base.html index 55c71d52..30854719 100644 --- a/templates/base.html +++ b/templates/base.html @@ -6,7 +6,6 @@ - {% block head %} {{ os_family | capitalize}} {{product_name | capitalize }} Packages diff --git a/templates/header.debian.html b/templates/header.debian.html index 7c630a7d..95039942 100644 --- a/templates/header.debian.html +++ b/templates/header.debian.html @@ -1,51 +1,12 @@ -{% extends "base.html" %} + -{% block distribution_instruction %} + -

- This is the Debian package repository of {{product_name}} to automate installation and upgrade. + - To use this repository, first add the key to your system: + + + + - 

-    
-  curl -fsSL {{web_url}}/{{organization}}-2023.key | sudo tee \
-    /usr/share/keyrings/jenkins-keyring.asc > /dev/null
-
- - Then add a Jenkins apt repository entry: - - 
-    
-  echo deb [signed-by=/usr/share/keyrings/jenkins-keyring.asc] \
-    {{ web_url }} binary/ | sudo tee \
-    /etc/apt/sources.list.d/jenkins.list > /dev/null
-
-

- -

-Update your local package index, then finally install {{product_name}}: - - 

-   
-  sudo apt-get update
-  sudo apt-get install fontconfig openjdk-17-jre
-  sudo apt-get install {{artifactName}}
-   
-
-

- -

-The apt packages were signed using this key: -

- -
{{ pub_key_info|trim }}
-{% endblock %} - -{% block individual_package_instruction %} - -

- If you need *.deb for a specific version, use these. -

- -{% endblock %} +

You are getting redirected to https://www.jenkins.io/doc/book/installing/linux/

diff --git a/templates/header.msi.html b/templates/header.msi.html index 5095a12f..9d0abb7e 100644 --- a/templates/header.msi.html +++ b/templates/header.msi.html @@ -1,11 +1,10 @@ -{% extends "base.html" %} + -{% block distribution_instruction %} + -

- This is the MSI package repository of {{product_name}} for installation. -

-{% endblock %} + + + + -{% block individual_package_instruction %}{% endblock %} -{% block java_instructions %}{% endblock %} +

You are getting redirected to https://www.jenkins.io/doc/book/installing/windows/

diff --git a/templates/header.opensuse.html b/templates/header.opensuse.html index cb0e7d19..655f35f1 100644 --- a/templates/header.opensuse.html +++ b/templates/header.opensuse.html @@ -1,27 +1,10 @@ -{% extends "base.html" %} + -{% block distribution_instruction %} + -To use this repository, run the following command: + + + + -
-
-  sudo zypper addrepo -f {{web_url}}/ {{artifactName}}
-
-
- -

-With that set up, the {{ product_name }} package can be installed with: - -

-
-  zypper install dejavu-fonts fontconfig java-17-openjdk
-  zypper install {{ artifactName }}
-
-
-

-{% endblock %} - -{% block individual_package_instruction %} -If you need *.rpm for a specific version, use these. -{% endblock %} +

You are getting redirected to https://www.jenkins.io/doc/book/installing/linux/

diff --git a/templates/header.redhat.html b/templates/header.redhat.html index 9b5996f8..655f35f1 100644 --- a/templates/header.redhat.html +++ b/templates/header.redhat.html @@ -1,35 +1,10 @@ -{% extends "base.html" %} + -{% block distribution_instruction %} + -

- To use this repository, run the following command: + + + + - 

-
-  sudo wget -O /etc/yum.repos.d/{{artifactName}}.repo {{ web_url }}/{{artifactName}}.repo
-  sudo rpm --import {{ web_url }}/{{organization}}-2023.key
-
- -

- If you've previously imported the key from Jenkins, the rpm --import will fail because - you already have a key. Please ignore that and move on. - - 

-
-  yum install fontconfig tzdata-java java-17-openjdk
-  yum install {{artifactName}}
-
- -

- The rpm packages were signed using this key: -

- - 
{{ pub_key_info|trim }}
- - -{% endblock %} - -{% block individual_package_instruction %} - If you need *.rpm for a specific version, use these. -{% endblock %} +

You are getting redirected to https://www.jenkins.io/doc/book/installing/linux/

diff --git a/templates/header.war.html b/templates/header.war.html index eb2ce9e4..2af9d1dd 100644 --- a/templates/header.war.html +++ b/templates/header.war.html @@ -1,73 +1,10 @@ -{% extends "base.html" %} + -{% block distribution_instruction %} + -

- This is the WAR package repository of {{ product_name }} for installation. -

-{% endblock %} + + + + -{% block java_instructions %} -

- You will need to explicitly install a supported Java runtime environment (JRE), - e.g. Eclipse Temurin. -

- -

- Weekly Release Line -

- -

- Supported Java versions for the weekly release line are: -

- -
-
2.419 (August 2023) and newer
-
Java 11, Java 17, or Java 21
- -
2.357 (June 2022) and newer
-
Java 11 or Java 17
- -
2.164 (February 2019) and newer
-
Java 8 or Java 11
- -
2.54 (April 2017) and newer
-
Java 8
- -
1.612 (May 2015) and newer
-
Java 7
-
- -

- Long Term Support (LTS) Release Line -

- -

- Supported Java versions for the LTS release line are: -

- -
-
2.361.1 (September 2022) and newer
-
Java 11 or Java 17
- -
2.346.1 (June 2022) and newer
-
Java 8, Java 11, or Java 17
- -
2.164.1 (March 2019) and newer
-
Java 8 or Java 11
- -
2.60.1 (June 2017) and newer
-
Java 8
- -
1.625.1 (October 2015) and newer
-
Java 7
-
-{% endblock %} - -{% block individual_package_instruction %} - -

- If you need *.war for a specific version, use these. -

- -{% endblock %} +

You are getting redirected to https://www.jenkins.io/doc/book/installing/war-file/

From 9591d57a531077df521157ae722d33841708bfd7 Mon Sep 17 00:00:00 2001 From: hainenber Date: Sat, 9 Sep 2023 00:10:47 +0700 Subject: [PATCH 3/4] feat(bin/indexGen): not generate unused HTMLs --- bin/indexGenerator.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/bin/indexGenerator.py b/bin/indexGenerator.py index e0b17006..11cffb9b 100755 --- a/bin/indexGenerator.py +++ b/bin/indexGenerator.py @@ -213,7 +213,4 @@ def generate_repository_index(self): headerGenerator = IndexGenerator(sys.argv[1:]) headerGenerator.show_information() headerGenerator.generate_repository_header() - headerGenerator.generate_footer() headerGenerator.generate_repository_index() - headerGenerator.generate_root_header() - headerGenerator.generate_root_footer() From 36909d04ea16bd5e026aee5b5040fc390ae48251 Mon Sep 17 00:00:00 2001 From: hainenber Date: Sat, 9 Sep 2023 00:11:28 +0700 Subject: [PATCH 4/4] feat(template/index): not include footer for redirection URL --- templates/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/index.html b/templates/index.html index 7d479e49..3daa8ea6 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,2 +1 @@ {% include header %} -{% include "footer.html" %}