fix: improve auto-generate package pages

Author: a-gave

.github/workflows/deploy.yml

@@ -9,10 +9,10 @@ jobs:
   build_and_deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Use GitHub Actions' cache to cache dependencies on servers
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -33,4 +33,4 @@ jobs:
           ruby_ver: ''               # Default is 3.2.0 version
           cname: ''                  # Default is to not use a cname
           actor: ''                  # Default is the GITHUB_ACTOR
-          pre_build_commands: ''     # Installing additional dependencies (Arch Linux)
+          pre_build_commands: 'pacman -Sy --noconfirm jq && ./collect_packages.sh'     # Installing additional dependencies (Arch Linux)

.gitignore

@@ -1,6 +1,9 @@
 html
 _site
 Gemfile.lock
+*~
+/packages/
+!/packages/index.txt
 
 .sass-cache
 .jekyll-cache

CNAME

@@ -1,29 +1,23 @@
 packages:
   - name: altermundi-grafana
   - name: auto-usb-wwan
-    readme: Readme.md
   - name: babeld-auto-gw-mode
-    readme: Readme.md
   - name: bandwidth-test
   - name: batman-adv-auto-gw-mode
   - name: bmx7-auto-gw-bw-mode
   - name: bmx7-auto-gw-mode
   - name: bmx7-mdns
   - name: check-date-http
-    readme: Readme.md
   - name: check-internet
-    readme: Readme.md
-  - name: cotonete
-    readme: README.md
-    makefile_external_url: https://raw.githubusercontent.com/nicopace/cotonete/master/packages/cotonete/Makefile
-  - name: deferable-reboot
+  - name: deferrable-reboot
   - name: eupgrade
   - name: first-boot-wizard
   - name: hotplug-initd-services
-  - name: lime-app
   - name: lime-ap-watchping
-    readme: README
+  - name: lime-app
   - name: lime-debug
+  - name: lime-docs-it
+  - name: lime-docs-minimal
   - name: lime-docs
   - name: lime-hwd-ground-routing
   - name: lime-hwd-openwrt-wan
@@ -41,13 +35,10 @@ packages:
   - name: lime-smart-wifi
   - name: lime-system
   - name: lua-argparse
-    readme: Readme.md
-  - name: luci-app-openairview
-  - name: luci-lib-jquery-flot
+  - name: luci-lib-jquery-flot-0-8
   - name: luci-mod-status
   - name: miniserver-client
   - name: pirania
-    readme: Readme.md
   - name: prometheus-node-exporter-lua-location-latlon
   - name: prometheus-node-exporter-lua-wifi-params
   - name: prometheus-node-exporter-lua-wifi-stations-extra
@@ -56,11 +47,9 @@ packages:
   - name: random-numgen
   - name: safe-reboot
   - name: safe-upgrade
-    readme: Readme.md
   - name: shared-state-async
-    readme: README.adoc
-  - name: shared-state-babeld_hosts
   - name: shared-state-babel_links_info
+  - name: shared-state-babeld_hosts
   - name: shared-state-bat_hosts
   - name: shared-state-bat_links_info
   - name: shared-state-dnsmasq_hosts
@@ -71,22 +60,17 @@ packages:
   - name: shared-state-nodes_and_links
   - name: shared-state-persist
   - name: shared-state-pirania
-  - name: shared-state
+  - name: shared-state-ref_state_commons
   - name: shared-state-wifi_links_info
+  - name: shared-state
   - name: soporteremoto
   - name: sprunge
   - name: ubus-lime-batman-adv
-    readme: Readme.md
   - name: ubus-lime-groundrouting
-    readme: Readme.md
   - name: ubus-lime-location
-    readme: Readme.md
   - name: ubus-lime-metrics
   - name: ubus-lime-openairview
-    readme: Readme.md
   - name: ubus-lime-utils
-    readme: README.md
   - name: ubus-tmate
-    readme: README.md
   - name: watchping
   - name: wifi-unstuck-wa

_data/packages.yml

@@ -1,41 +1,45 @@
 #!/bin/bash
 
-PACKAGES_INDEX=$(yq '.packages' _data/packages.yml)
+PACKAGES_LIST=$(curl https://feed.libremesh.org/master/index.json | jq -r '.packages | to_entries[] | "\(.key)"')
 GITHUB_URL="https://raw.githubusercontent.com/libremesh/lime-packages/master/packages"
 PACKAGES_DIR=packages
+READMES=(Readme.md README.md README README.adoc) 
+
 mkdir -p $PACKAGES_DIR
 
-echo $PACKAGES_INDEX | jq -r '.[]|[.name, .readme, .makefile_external_url] | @tsv' |
-  while IFS=$'\t' read -r name readme makefile_external_url; do
-		
-		[ -n "$name" ] && echo $name && \
-cat /dev/null > $PACKAGES_DIR/$name.txt && \
-cat << EOF >> $PACKAGES_DIR/$name.txt
+# cleanup
+rm -r `ls packages/ | grep -v "index.txt" | sed 's|^|packages/|g'`
+echo "packages:" > _data/packages.yml
+
+for name in $PACKAGES_LIST; do
+	echo "  - name: $name" >> _data/packages.yml
+
+	cat << EOF >> $PACKAGES_DIR/$name.txt
 ---
 title: $name
 ref: $name
 lang: en
 ---
 EOF
 
-		[ -n "$readme" ] && echo $readme && \
-README="" && \
-README=$(curl "$GITHUB_URL/$name/$readme") && \
-cat << EOF >> $PACKAGES_DIR/$name.txt
+	README=""
+	for file in READMES; do
+		README=$(curl "$GITHUB_URL/$name/$file" || "")
+		if [ "$README" != "404: Not Found" ]; then break; fi
+	done
+
+	if [ "$README" != "404: Not Found" ]; then \
+	cat << EOF >> $PACKAGES_DIR/$name.txt
 
 == Readme
 ____
 $README
 ____
 EOF
+	fi
 
-MAKEFILE_URL=""
-	[ -n "$makefile_external_url" ] && \
-MAKEFILE_URL="$makefile_external_url" || \
-MAKEFILE_URL="$GITHUB_URL/$name/Makefile"
-
-MAKEFILE=$(curl "$MAKEFILE_URL") && \
-cat << EOF >> $PACKAGES_DIR/$name.txt
+	MAKEFILE=$(curl "$GITHUB_URL/$name/Makefile") && \
+	cat << EOF >> $PACKAGES_DIR/$name.txt
 
 == Makefile
 [,make]
@@ -44,5 +48,4 @@ $MAKEFILE
 ----
 EOF
 
-  done
-
+done