Merge branch 'pacstall:master' into master

Author: CelestifyX

.github/workflows/codacy-analysis.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: master
 
@@ -72,7 +72,7 @@ jobs:
           fi
           added_entries="$(echo "$diff_output" | grep '^+ ' | sed 's/^\+  //' | awk -v ORS=', ' '{print "`"$0"`"}' | sed 's/, $//')"
           removed_entries="$(echo "$diff_output" | grep '^- ' | sed 's/^-  //' | awk -v ORS=', ' '{print "`"$0"`"}' | sed 's/, $//')"
-          title="upd(distrolist): "
+          title="ci(distrolist): "
           if [[ -n "$added_entries" && -z "$removed_entries" ]]; then
             title+="add ${added_entries}"
           elif [[ -z "$added_entries" && -n "$removed_entries" ]]; then
@@ -92,7 +92,7 @@ jobs:
 
       - name: Create PR if changes detected
         if: env.changes_detected == 'true'
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           add-paths: distrolist

.github/workflows/distrolist.yml

@@ -2,7 +2,7 @@ name: Label PRs
 
 on:
   pull_request_target:
-    types: [opened, reopened]
+    types: [opened, reopened, edited]
 
 jobs:
   label-pr:

.github/workflows/main.yml

@@ -11,4 +11,4 @@ jobs:
   assign-author:
     runs-on: ubuntu-latest
     steps:
-      - uses: toshimaru/auto-author-assign@v2.1.1
+      - uses: toshimaru/auto-author-assign@v3.0.0

.github/workflows/pr.yml

@@ -11,10 +11,10 @@ defaults:
   run:
     shell: bash
 jobs:
-  test-on-ubuntu:
+  run-tests:
     strategy:
       matrix:
-        OS: ["ubuntu:latest", "ubuntu:devel", "ubuntu:rolling"]
+        OS: ["ubuntu:latest", "ubuntu:devel", "ubuntu:rolling", "debian:stable", "debian:testing", "debian:unstable"]
         PACSTALL_VERSION: ["master", "develop"]
       fail-fast: false
     runs-on: ubuntu-latest
@@ -32,7 +32,7 @@ jobs:
         uses: mxschmitt/action-tmate@v3
         if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
       - id: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - id: paths
         uses: dorny/paths-filter@v3
         with:
@@ -55,6 +55,7 @@ jobs:
         run: |
           dpkg --add-architecture i386
           dpkg --add-architecture arm64
+          if  [[ $(awk -F= '$1=="ID" { print $2 }' /etc/os-release) == "ubuntu" ]]; then
           source /etc/os-release && echo "Types: deb
           URIs: http://ports.ubuntu.com/ubuntu-ports/
           Suites: ${VERSION_CODENAME} ${VERSION_CODENAME}-updates ${VERSION_CODENAME}-backports
@@ -81,8 +82,10 @@ jobs:
           Suites: ${VERSION_CODENAME}-security
           Components: main universe restricted multiverse
           Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
-          Architectures-Remove: arm64" | tee /etc/apt/sources.list.d/ubuntu.sources && rm -f /etc/apt/sources.list && apt-get update
-          apt-get install apt-utils curl bash wget git sudo iputils-ping keyboard-configuration lsb-release desktop-file-utils -y
+          Architectures-Remove: arm64" | tee /etc/apt/sources.list.d/ubuntu.sources && rm -f /etc/apt/sources.list
+          fi
+          apt-get update
+          apt-get install apt-utils curl ca-certificates bash wget git sudo iputils-ping keyboard-configuration lsb-release desktop-file-utils -y --no-install-recommends
           ln -fs /usr/share/zoneinfo/Africa/Libreville /etc/localtime
       - name: Setup Test User
         if: steps.paths.outputs.pacscripts == 'true'
@@ -129,127 +132,17 @@ jobs:
         shell: sudo -E -u dio bash {0}
         env:
           DEBIAN_FRONTEND: noninteractive
-      - name: Uninstalling Packages
+      - name: Output Package Trees
         if: steps.paths.outputs.pacscripts == 'true'
         run: |
           export SUDO_USER=$USER
           export DEBIAN_FRONTEND=noninteractive
           export GITHUB_ACTIONS=true
-          export METADIR=/var/lib/pacstall/metadata
-          function array.contains() {
-              local check
-              local -n arra="${1:?No array passed to array.contains}"
-              local input="${2:?No input given to array.contains}"
-              for check in "${arra[@]}"; do
-                  if [[ ${check} == "${input}" ]]; then
-                      return 0
-                  fi
-              done
-              return 1
-          }
-          function stacktrace() {
-            catch=$?
-            return "${catch}"
-          }
-          source /usr/share/pacstall/scripts/dep-tree.sh
           mapfile -t list < <(pacstall -L)
-          dep_tree.loop_traits order "${list[@]}"
-          for changed_file in "${order[@]}"; do
-              echo "Running pacstall -R for ${changed_file}..."
-              pacstall --disable-prompts -R ${changed_file} || exit 1
-          done
-        shell: sudo -E -u dio bash {0}
-        env:
-          DEBIAN_FRONTEND: noninteractive
-
-  test-on-debian:
-    strategy:
-      matrix:
-        OS: ["debian:stable", "debian:testing", "debian:unstable"]
-        PACSTALL_VERSION: ["master", "develop"]
-      fail-fast: false
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ matrix.OS }}
-      options: --privileged
-      env:
-        TERM: xterm
-        shell: bash
-        USER: dio
-        LOGNAME: dio
-        DEBIAN_FRONTEND: noninteractive
-    steps:
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
-      - id: checkout
-        uses: actions/checkout@v4
-      - id: paths
-        uses: dorny/paths-filter@v3
-        with:
-          filters: |
-            pacscripts:
-              - 'packages/*/*.pacscript'
-      - id: files
-        uses: Ana06/get-changed-files@v2.3.0
-      - name: Check for Pacscript changes
-        run: |
-          touch .no-pacscript-changes
-          for changed_file in ${{ steps.files.outputs.added_modified }}; do
-            if [[ ${changed_file} == *".pacscript" ]]; then
-              rm -f .no-pacscript-changes
-              break
-            fi
-          done
-      - name: Install System Utilities
-        if: steps.paths.outputs.pacscripts == 'true'
-        run: |
-          dpkg --add-architecture i386
-          dpkg --add-architecture arm64
-          apt-get update
-          apt-get install apt-utils curl bash wget git sudo iputils-ping keyboard-configuration lsb-release desktop-file-utils -y
-          ln -fs /usr/share/zoneinfo/Africa/Libreville /etc/localtime
-      - name: Setup Test User
-        if: steps.paths.outputs.pacscripts == 'true'
-        run: |
-          useradd -rm -d /home/$USER -s /bin/bash -g root -G sudo -u 1001 $USER
-          sudo sed -i "s/%sudo\tALL=(ALL:ALL) ALL/%sudo\tALL=(ALL) NOPASSWD:ALL/g" /etc/sudoers
-          chown -R $USER /tmp
-          chmod -R 777 /tmp
-      - name: Installing Pacstall
-        if: steps.paths.outputs.pacscripts == 'true'
-        run: |
-          export SUDO_USER=$USER
-          curl -fsSL https://pacstall.dev/q/install\?dnt > pacstall-install.sh || curl -fsSL https://git.io/JsADh > pacstall-install.sh
-          chmod +x ./pacstall-install.sh
-          echo N\n | sudo -E ./pacstall-install.sh
-          rm ./pacstall-install.sh
-          sudo sed -i 's/ignore_stack=false/ignore_stack=true/g' /usr/bin/pacstall
-          pacstall -U pacstall ${{ matrix.PACSTALL_VERSION }}
-          ls -lad /tmp/pacstall
-        shell: sudo -E -u dio bash {0}
-        env:
-          SUDO_USER: dio
-      - name: Installing Packages
-        if: steps.paths.outputs.pacscripts == 'true'
-        run: |
-          export SUDO_USER=$USER
-          export DEBIAN_FRONTEND=noninteractive
-          export GITHUB_ACTIONS=true
-          export METADIR=/var/lib/pacstall/metadata
-          PRNUM="$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')"
-          for changed_file in ${{ steps.files.outputs.added_modified }}; do
-            if [[ ${changed_file} == *".pacscript" ]]; then
-              pacscript_file=`basename "${changed_file}"`
-              package_name="${pacscript_file/.pacscript/}"
-              if [[ -f "${METADIR}/${package_name}" ]]; then
-                echo "Package ${package_name} has already been installed."
-              else
-                echo "Running pacstall -Qa for ${package_name}..."
-                echo "pacstall -Qa ${package_name}#${PRNUM}@github:${GITHUB_REPOSITORY}"
-                pacstall -Qa ${package_name}#${PRNUM}@github:${GITHUB_REPOSITORY} || exit 1
-              fi
-            fi
+          for pkg in "${list[@]}"; do
+            echo "${pkg}:"
+            pacstall -T "${pkg}"
+            echo "---"
           done
         shell: sudo -E -u dio bash {0}
         env:

.github/workflows/tests.yml

@@ -5,7 +5,7 @@ exclude: '^.*\.(patch)$'
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -14,13 +14,13 @@ repos:
       - id: mixed-line-ending
         args: ["--fix=lf"]
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.10.0.1
+    rev: v0.11.0.1
     hooks:
       - id: shellcheck
         types: []
         files: '^.*\.(pacscript|sh)$'
   - repo: https://github.com/maxwinterstein/shfmt-py
-    rev: v3.11.0.2
+    rev: v3.12.0.1
     hooks:
       - id: shfmt
         args: ["-i", "2", "-bn", "-ci", "-sr", "-s", "-w"]

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 ubuntu:
-  focal/20.04
   jammy/22.04
   noble/24.04
-  oracular/24.10
   plucky/25.04
   questing/25.10
+  resolute/26.04
   devel
 debian:
   bullseye/11
   bookworm/12
   trixie/13
+  forky/14
   sid