From ae3a26b0eccdb76ead19e5e56a570aa166b5e276 Mon Sep 17 00:00:00 2001 From: Dominik Heidler Date: Wed, 19 Jul 2023 10:31:38 +0200 Subject: [PATCH 1/2] RPM Registry: Show zypper commands for SUSE based distros as well --- docs/content/doc/usage/packages/overview.en-us.md | 2 +- docs/content/doc/usage/packages/overview.zh-cn.md | 2 +- docs/content/doc/usage/packages/rpm.en-us.md | 2 +- docs/content/doc/usage/packages/rpm.zh-cn.md | 2 +- options/locale/locale_en-US.ini | 2 ++ templates/package/content/rpm.tmpl | 12 ++++++++++-- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/docs/content/doc/usage/packages/overview.en-us.md b/docs/content/doc/usage/packages/overview.en-us.md index 944505a04a00a..bf33ea627d1b3 100644 --- a/docs/content/doc/usage/packages/overview.en-us.md +++ b/docs/content/doc/usage/packages/overview.en-us.md @@ -44,7 +44,7 @@ The following package managers are currently supported: | [NuGet]({{< relref "doc/usage/packages/nuget.en-us.md" >}}) | .NET | `nuget` | | [Pub]({{< relref "doc/usage/packages/pub.en-us.md" >}}) | Dart | `dart`, `flutter` | | [PyPI]({{< relref "doc/usage/packages/pypi.en-us.md" >}}) | Python | `pip`, `twine` | -| [RPM]({{< relref "doc/usage/packages/rpm.en-us.md" >}}) | - | `yum`, `dnf` | +| [RPM]({{< relref "doc/usage/packages/rpm.en-us.md" >}}) | - | `yum`, `dnf`, `zypper` | | [RubyGems]({{< relref "doc/usage/packages/rubygems.en-us.md" >}}) | Ruby | `gem`, `Bundler` | | [Swift]({{< relref "doc/usage/packages/rubygems.en-us.md" >}}) | Swift | `swift` | | [Vagrant]({{< relref "doc/usage/packages/vagrant.en-us.md" >}}) | - | `vagrant` | diff --git a/docs/content/doc/usage/packages/overview.zh-cn.md b/docs/content/doc/usage/packages/overview.zh-cn.md index 70851fa2ead58..9d24a733fd3a6 100644 --- a/docs/content/doc/usage/packages/overview.zh-cn.md +++ b/docs/content/doc/usage/packages/overview.zh-cn.md @@ -44,7 +44,7 @@ menu: | [NuGet]({{< relref "doc/usage/packages/nuget.zh-cn.md" >}}) | .NET | `nuget` | | [Pub]({{< relref "doc/usage/packages/pub.zh-cn.md" >}}) | Dart | `dart`, `flutter` | | [PyPI]({{< relref "doc/usage/packages/pypi.zh-cn.md" >}}) | Python | `pip`, `twine` | -| [RPM]({{< relref "doc/usage/packages/rpm.zh-cn.md" >}}) | - | `yum`, `dnf` | +| [RPM]({{< relref "doc/usage/packages/rpm.zh-cn.md" >}}) | - | `yum`, `dnf`, `zypper` | | [RubyGems]({{< relref "doc/usage/packages/rubygems.zh-cn.md" >}}) | Ruby | `gem`, `Bundler` | | [Swift]({{< relref "doc/usage/packages/rubygems.zh-cn.md" >}}) | Swift | `swift` | | [Vagrant]({{< relref "doc/usage/packages/vagrant.zh-cn.md" >}}) | - | `vagrant` | diff --git a/docs/content/doc/usage/packages/rpm.en-us.md b/docs/content/doc/usage/packages/rpm.en-us.md index d4ff727ade1ef..79c23f39a0adb 100644 --- a/docs/content/doc/usage/packages/rpm.en-us.md +++ b/docs/content/doc/usage/packages/rpm.en-us.md @@ -22,7 +22,7 @@ Publish [RPM](https://rpm.org/) packages for your user or organization. ## Requirements -To work with the RPM registry, you need to use a package manager like `yum` or `dnf` to consume packages. +To work with the RPM registry, you need to use a package manager like `yum`, `dnf` or `zypper` to consume packages. The following examples use `dnf`. diff --git a/docs/content/doc/usage/packages/rpm.zh-cn.md b/docs/content/doc/usage/packages/rpm.zh-cn.md index 405e141afdb96..f76273e5a8c1b 100644 --- a/docs/content/doc/usage/packages/rpm.zh-cn.md +++ b/docs/content/doc/usage/packages/rpm.zh-cn.md @@ -22,7 +22,7 @@ menu: ## 要求 -要使用RPM注册表，您需要使用像 `yum` 或 `dnf` 这样的软件包管理器来消费软件包。 +要使用RPM注册表，您需要使用像 `yum`, `dnf` 或 `zypper` 这样的软件包管理器来消费软件包。 以下示例使用 `dnf`。 diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d00a2d83865bd..5f671676b5854 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3328,6 +3328,8 @@ pub.install = To install the package using Dart, run the following command: pypi.requires = Requires Python pypi.install = To install the package using pip, run the following command: rpm.registry = Setup this registry from the command line: +rpm.distros.redhat = on RedHat based distributions +rpm.distros.suse = on SUSE based distributions rpm.install = To install the package, run the following command: rubygems.install = To install the package using gem, run the following command: rubygems.install2 = or add it to the Gemfile: diff --git a/templates/package/content/rpm.tmpl b/templates/package/content/rpm.tmpl index 42965c3271a25..4da2abff39d4e 100644 --- a/templates/package/content/rpm.tmpl +++ b/templates/package/content/rpm.tmpl @@ -4,12 +4,20 @@
- 
dnf config-manager --add-repo
+ 
# {{.locale.Tr "packages.rpm.distro.redhat"}}
+dnf config-manager --add-repo 
+
+# {{.locale.Tr "packages.rpm.distro.suse"}}
+zypper addrepo
- 
dnf install {{$.PackageDescriptor.Package.Name}}
+ 
# {{.locale.Tr "packages.rpm.distro.redhat"}}
+dnf install {{$.PackageDescriptor.Package.Name}}
+
+# {{.locale.Tr "packages.rpm.distro.suse"}}
+zypper install {{$.PackageDescriptor.Package.Name}}
From 9ce95feb7afaa6fce412eab586a389e3bef96c0b Mon Sep 17 00:00:00 2001 From: Dominik Heidler Date: Wed, 19 Jul 2023 16:10:53 +0200 Subject: [PATCH 2/2] Fix mention of debian in RPM registry docs --- docs/content/doc/usage/packages/rpm.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/usage/packages/rpm.en-us.md b/docs/content/doc/usage/packages/rpm.en-us.md index 79c23f39a0adb..7a258f5c03641 100644 --- a/docs/content/doc/usage/packages/rpm.en-us.md +++ b/docs/content/doc/usage/packages/rpm.en-us.md @@ -79,7 +79,7 @@ The server responds with the following HTTP Status codes. ## Delete a package -To delete a Debian package perform a HTTP DELETE operation. This will delete the package version too if there is no file left. +To delete an RPM package perform a HTTP DELETE operation. This will delete the package version too if there is no file left. ``` DELETE https://gitea.example.com/api/packages/{owner}/rpm/{package_name}/{package_version}/{architecture}