Merge branch 'source' into source

crystal-linux · Apr 2, 2024 · a2d9b08 · a2d9b08
2 parents 34e570e + 3c0a04b
commit a2d9b08
Show file tree

Hide file tree

Showing 18 changed files with 982 additions and 1,060 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,6 +1 @@
-FROM fedora:30
-
-RUN dnf install -y \
-        ruby rubygems rubygem-bundler rubygem-json \
-        git gcc gcc-c++ make redhat-rpm-config patch \
-        ruby-devel libffi-devel zlib-devel
+FROM docker.io/library/ruby:3.0.4
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -17,4 +17,8 @@
 	"postCreateCommand": "gem install bundler:2.3.5 && bundle install",
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	// "remoteUser": "vscode"
+	"workspaceMount": "",
+	"runArgs": [
+		"--volume=${localWorkspaceFolder}:/workspaces/${localWorkspaceFolderBasename}:Z"
+	]
 }
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - uses: ruby/setup-ruby@v1
       with:
@@ -30,7 +30,7 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
-    - uses: docker/build-push-action@v3
+    - uses: docker/build-push-action@v4
       with:
         file: Dockerfile
         push: ${{ github.event_name != 'pull_request' }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Setup ruby
       uses: ruby/setup-ruby@v1

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.6)
+    activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -26,7 +26,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     contracts (0.13.0)
     dotenv (2.7.6)
     em-websocket (0.5.3)
@@ -100,11 +100,11 @@ GEM
       sprockets (>= 3.0)
     mini_racer (0.6.2)
       libv8-node (~> 16.10.0.0)
-    minitest (5.15.0)
+    minitest (5.19.0)
     net-sftp (3.0.0)
       net-ssh (>= 5.0.0, < 7.0.0)
     net-ssh (6.1.0)
-    nokogiri (1.13.6-x86_64-linux)
+    nokogiri (1.16.2-x86_64-linux)
       racc (~> 1.4)
     padrino-helpers (0.15.1)
       i18n (>= 0.6.7, < 2)
@@ -115,8 +115,8 @@ GEM
     parslet (2.0.0)
     ptools (1.4.2)
     public_suffix (4.0.7)
-    racc (1.6.0)
-    rack (2.2.3.1)
+    racc (1.7.3)
+    rack (2.2.8.1)
     rack-livereload (0.3.17)
       rack
     rb-fsevent (0.11.1)
@@ -140,12 +140,12 @@ GEM
     tilt (2.0.10)
     toml (0.3.0)
       parslet (>= 1.8.0, < 3.0.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     webrick (1.7.0)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   x86_64-linux
@@ -165,4 +165,4 @@ DEPENDENCIES
   sass
 
 BUNDLED WITH
-   2.2.33
+   2.3.5
diff --git a/README.md b/README.md
@@ -4,7 +4,9 @@
 
 To set up middleman locally on Fedora:
 
-    dnf install ruby rubygems rubygem-bundler rubygem-json
+```shell
+dnf install ruby rubygems rubygem-bundler rubygem-json
+```
 
 In the git checkout, do a `bundle install`. This installs all
 the needed modules in their appropriate versions.
@@ -15,8 +17,8 @@ Add the middleman binary location (probably ~/bin) to $PATH.
 
 To run a local web server to test the site:
 
-```sh
-    bundle exec middleman server
+```shell
+bundle exec middleman server
 ```
 
 Edit the haml/scss files and commit your changes, pushing to

diff --git a/config.rb b/config.rb
@@ -17,7 +17,7 @@
 #  which_fake_page: "Rendering a fake page with a local variable" }
 
 data.distro.each do |i|
-  proxy "/setup/#{i.slug ? i.slug : i.name}.html", "/distro-template.html", :locals => { :name => i.name, :logo => i.logo, :info => i.info, :slug => i.slug }, :ignore => true
+  proxy "/setup/#{i.slug ? i.slug : i.name}.html", "/distro-template.html", :locals => { :name => i.name, :logo => i.logo, :introduction => i.introduction, :steps => i.steps, :slug => i.slug }, :ignore => true
 end
 
 # General configuration

diff --git a/data/apps.yml b/data/apps.yml
@@ -4,116 +4,118 @@
   summary:  "Desktop messenger"
   color:    "#6DA9D6"
   featured: "yes"
-  "flatpakref": "https://flathub.org/repo/appstream/org.telegram.desktop.flatpakref"
+  "flatpakref": "https://dl.flathub.org/repo/appstream/org.telegram.desktop.flatpakref"
   icons:
-    "128":  "https://flathub.org/repo/appstream/x86_64/icons/128x128/org.telegram.desktop.png"
-    "64":   "https://flathub.org/repo/appstream/x86_64/icons/64x64/org.telegram.desktop.png"
+    "128":  "https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/org.telegram.desktop.png"
+    "64":   "https://dl.flathub.org/repo/appstream/x86_64/icons/64x64/org.telegram.desktop.png"
 
 - name:     "Slack"
   id:       "com.slack.Slack"
   ref:      "app/com.slack.Slack/x86_64/stable"
   summary:  "Chat with your team"
   color:    "#C5BFB5"
-  "flatpakref": "https://flathub.org/repo/appstream/com.slack.Slack.flatpakref"
+  "flatpakref": "https://dl.flathub.org/repo/appstream/com.slack.Slack.flatpakref"
   icons:
-    "64":   "https://lh3.googleusercontent.com/Dq-mZ5mmdE6aFPeD61DNlVTwYSI75UwHBYDq_BxBZOMSzCBnQ5OCC4-LjfP42tDlyw=w64"
-
+    "128":  "https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/com.slack.Slack.png"
+    "64":   "https://dl.flathub.org/repo/appstream/x86_64/icons/64x64/com.slack.Slack.png"
+
 - name:     "Inkscape"
   id:       "org.inkscape.Inkscape"
   ref:      "app/org.inkscape.Inkscape/x86_64/stable"
   summary:  "Vector graphics editor"
   color:    "#C5BFB5"
-  "flatpakref": "https://flathub.org/repo/appstream/org.inkscape.Inkscape.flatpakref"
+  "flatpakref": "https://dl.flathub.org/repo/appstream/org.inkscape.Inkscape.flatpakref"
   icons:
-    "128":  "https://flathub.org/repo/appstream/x86_64/icons/128x128/org.inkscape.Inkscape.png"
-    "64":   "https://flathub.org/repo/appstream/x86_64/icons/64x64/org.inkscape.Inkscape.png"
+    "128":  "https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/org.inkscape.Inkscape.png"
+    "64":   "https://dl.flathub.org/repo/appstream/x86_64/icons/64x64/org.inkscape.Inkscape.png"
 
 - name:     "Spotify"
   id:       "com.spotify.Client"
   ref:      "app/com.spotify.Client/x86_64/stable"
   summary:  "Online music streaming service"
   color:    "#1DC558"
-  "flatpakref": "https://flathub.org/repo/appstream/com.spotify.Client.flatpakref"
+  "flatpakref": "https://dl.flathub.org/repo/appstream/com.spotify.Client.flatpakref"
   icons:
-    "64":   "https://lh3.googleusercontent.com/UrY7BAZ-XfXGpfkeWg0zCCeo-7ras4DCoRalC_WXXWTK9q5b0Iw7B0YQMsVxZaNB7DM=w64"
-
+    "128":  "https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/com.spotify.Client.png"
+    "64":   "https://dl.flathub.org/repo/appstream/x86_64/icons/64x64/com.spotify.Client.png"
+
 - name:     "Steam"
   id:       "com.valvesoftware.Steam"
   ref:      "app/com.valvesoftware.Steam/x86_64/stable"
   summary:  "Manage and play games distributed by Steam"
   featured: "yes"
   color:    "#7C8699"
-  "flatpakref": "https://flathub.org/repo/appstream/com.valvesoftware.Steam.flatpakref"
+  "flatpakref": "https://dl.flathub.org/repo/appstream/com.valvesoftware.Steam.flatpakref"
   icons:
-    "128":  "https://flathub.org/repo/appstream/x86_64/icons/128x128/com.valvesoftware.Steam.png"
-    "64":   "https://flathub.org/repo/appstream/x86_64/icons/64x64/com.valvesoftware.Steam.png"
+    "128":  "https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/com.valvesoftware.Steam.png"
+    "64":   "https://dl.flathub.org/repo/appstream/x86_64/icons/64x64/com.valvesoftware.Steam.png"
 
 - name:     "GIMP"
   id:       "org.gimp.GIMP"
   ref:      "app/org.gimp.GIMP/x86_64/stable"
   summary:  "Create images and edit photographs"
   color:    "#837E77"
-  "flatpakref": "https://flathub.org/repo/appstream/org.gimp.GIMP.flatpakref"
+  "flatpakref": "https://dl.flathub.org/repo/appstream/org.gimp.GIMP.flatpakref"
   icons:
-    "128":  "https://flathub.org/repo/appstream/x86_64/icons/128x128/org.gimp.GIMP.png"
-    "64":   "https://flathub.org/repo/appstream/x86_64/icons/64x64/org.gimp.GIMP.png"
-    
-- name:     "Atom"
-  id:       "io.atom.Atom"
-  ref:      "app/io.atom.Atom/x86_64/stable"
-  summary:  "A hackable text editor for the 21st Century"
-  color:    "#96CBA5"
-  "flatpakref": "https://flathub.org/repo/appstream/io.atom.Atom.flatpakref"
+    "128":  "https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/org.gimp.GIMP.png"
+    "64":   "https://dl.flathub.org/repo/appstream/x86_64/icons/64x64/org.gimp.GIMP.png"
+
+- name:     "Firefox"
+  id:       "org.mozilla.firefox"
+  ref:      "app/org.mozilla.firefox/x86_64/stable"
+  summary:  "Fast, Private & Safe Web Browser"
+  color:    "#FFEF42"
+  "flatpakref": "https://dl.flathub.org/repo/appstream/org.mozilla.firefox.flatpakref"
   icons:
-    "128":  "https://flathub.org/repo/appstream/x86_64/icons/128x128/io.atom.Atom.png"
-    "64":   "https://flathub.org/repo/appstream/x86_64/icons/64x64/io.atom.Atom.png"
+    "128":  "https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/org.mozilla.firefox.png"
+    "64":   "https://dl.flathub.org/repo/appstream/x86_64/icons/64x64/org.mozilla.firefox.png"
 
 - name:     "Kdenlive"
   id:       "org.kde.kdenlive"
   ref:      "app/org.kde.kdenlive/x86_64/stable"
   summary:  "Video editor"
   color:    "#8596C6"
-  "flatpakref": "https://flathub.org/repo/appstream/org.kde.kdenlive.flatpakref"
+  "flatpakref": "https://dl.flathub.org/repo/appstream/org.kde.kdenlive.flatpakref"
   icons:
-    "128":  "https://flathub.org/repo/appstream/x86_64/icons/128x128/org.kde.kdenlive.png"
-    "64":   "https://flathub.org/repo/appstream/x86_64/icons/64x64/org.kde.kdenlive.png"
-    
+    "128":  "https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/org.kde.kdenlive.png"
+    "64":   "https://dl.flathub.org/repo/appstream/x86_64/icons/64x64/org.kde.kdenlive.png"
+
 - name:     "Skype"
   id:       "com.skype.Client"
   ref:      "app/com.skype.Client/x86_64/stable"
   summary:  "Call and message Skype users"
   color:    "#C5BFB5"
-  "flatpakref": "https://flathub.org/repo/appstream/com.skype.Client.flatpakref"
+  "flatpakref": "https://dl.flathub.org/repo/appstream/com.skype.Client.flatpakref"
   icons:
-    "64":   "https://lh3.googleusercontent.com/QfAEt_ya6-n8w_TD9-PsghFC2DMSO7fLGNZB4cQ3RtbBbHFkXJE_gxOc3l32-j6LXg=w64"
+    "128":  "https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/com.skype.Client.png"
+    "64":   "https://dl.flathub.org/repo/appstream/x86_64/icons/64x64/com.skype.Client.png"
 
-- name:     "Google Play Music"
-  id:       "com.googleplaymusicdesktopplayer.GPMDP"
-  ref:      "app/com.googleplaymusicdesktopplayer.GPMDP/x86_64/stable"
-  summary:  "Google Play Music desktop app"
-  color:    "#FAA22B"
-  featured: "yes"
-  "flatpakref": "https://flathub.org/repo/appstream/com.googleplaymusicdesktopplayer.GPMDP.flatpakref"
-  icons:
-    "128":  "https://flathub.org/repo/appstream/x86_64/icons/128x128/com.googleplaymusicdesktopplayer.GPMDP.png"
-    "64":   "https://flathub.org/repo/appstream/x86_64/icons/64x64/com.googleplaymusicdesktopplayer.GPMDP.png"
-
 - name:     "VLC"
   id:       "org.videolan.VLC"
   ref:      "app/org.videolan.VLC/x86_64/stable"
   summary:  "Open-source multimedia player"
   color:    "#DB946C"
-  "flatpakref": "https://flathub.org/repo/appstream/org.videolan.VLC.flatpakref"
+  "flatpakref": "https://dl.flathub.org/repo/appstream/org.videolan.VLC.flatpakref"
   icons:
-    "128":  "https://flathub.org/repo/appstream/x86_64/icons/128x128/org.videolan.VLC.png"
-    "64":   "https://flathub.org/repo/appstream/x86_64/icons/64x64/org.videolan.VLC.png"
+    "128":  "https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/org.videolan.VLC.png"
+    "64":   "https://dl.flathub.org/repo/appstream/x86_64/icons/64x64/org.videolan.VLC.png"
 
 - name:     "Blender"
   id:       "org.blender.Blender"
   ref:      "app/org.blender.Blender/x86_64/stable"
   summary:  "3D modelling and animation"
   color:    "#D89C7F"
-  "flatpakref": "https://flathub.org/repo/appstream/com.slack.Slack.flatpakref"
+  "flatpakref": "https://dl.flathub.org/repo/appstream/com.slack.Slack.flatpakref"
+  icons:
+    "128":  "https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/org.blender.Blender.png"
+    "64":   "https://dl.flathub.org/repo/appstream/x86_64/icons/64x64/org.blender.Blender.png"
+
+- name:     "Podman Desktop"
+  id:       "io.podman_desktop.PodmanDesktop"
+  ref:      "app/io.podman_desktop.PodmanDesktop/x86_64/stable"
+  summary:  "Manage Podman and other container engines from a single UI and tray"
+  color:    "#A337D4"
+  "flatpakref": "https://dl.flathub.org/repo/appstream/io.podman_desktop.PodmanDesktop.flatpakref"
   icons:
-    "128":  "https://flathub.org/repo/appstream/x86_64/icons/128x128/org.blender.Blender.png"
-    "64":   "https://flathub.org/repo/appstream/x86_64/icons/64x64/org.blender.Blender.png"
+    "128":  "https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/io.podman_desktop.PodmanDesktop.png"
+    "64":   "https://dl.flathub.org/repo/appstream/x86_64/icons/64x64/io.podman_desktop.PodmanDesktop.png"