Merge pull request #8 from babichgh/master

Update user input prompts to read from /dev/tty

.github/workflows/dexoron-packages-index.yml

@@ -2,6 +2,11 @@ name: Dexoron Packages Index
 
 on:
   workflow_dispatch:
+    inputs:
+      tag:
+        description: "Версия (тег) для ручного импорта пакетов (например, v0.6.9)"
+        required: true
+        type: string
   workflow_run:
     workflows: ["Release"]
     types:
@@ -13,7 +18,7 @@ permissions:
 jobs:
   update-packages-index:
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event_workflow_run.conclusion == 'success' }}
 
     steps:
       - name: Checkout Central Packages Repo
@@ -23,105 +28,82 @@ jobs:
           token: ${{ secrets.PACKAGES_REPO_TOKEN }}
           path: 'central-packages'
 
-      # --- СКАЧИВАНИЕ АРТЕФАКТОВ ИЗ РЕЛИЗА ---
+      - name: Import GPG Key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
 
-      - name: Download Arch package artifact
+      # --- Загрузка артефактов (сохранена прежняя логика) ---
+      - name: Download Artifacts
         if: ${{ github.event_name == 'workflow_run' }}
         uses: actions/download-artifact@v4
         with:
-          name: arch-package
-          path: central-packages/archlinux/x86_64/
-          github-token: ${{ secrets.PACKAGES_REPO_TOKEN }}
+          path: central-packages/
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           run-id: ${{ github.event.workflow_run.id }}
-        continue-on-error: true
 
-      - name: Download Debian package artifact
-        if: ${{ github.event_name == 'workflow_run' }}
-        uses: actions/download-artifact@v4
-        with:
-          name: debian-package
-          path: central-packages/debian/
-          github-token: ${{ secrets.PACKAGES_REPO_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id }}
-        continue-on-error: true
+      - name: Download Packages from Release Assets
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG: ${{ inputs.tag }}
+        run: |
+          gh release download "$TAG" --repo dexoron/dcr --pattern "*.pkg.tar.zst" --dir central-packages/archlinux/x86_64/ --clobber
+          gh release download "$TAG" --repo dexoron/dcr --pattern "*.deb" --dir central-packages/debian/ --clobber
+          gh release download "$TAG" --repo dexoron/dcr --pattern "*.rpm" --dir central-packages/fedora/x86_64/ --clobber
 
-      - name: Download RPM package artifact
-        if: ${{ github.event_name == 'workflow_run' }}
-        uses: actions/download-artifact@v4
-        with:
-          name: rpm-package
-          path: central-packages/rpm/x86_64/
-          github-token: ${{ secrets.PACKAGES_REPO_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id }}
-        continue-on-error: true
+      # --- ИНДЕКСАЦИЯ И ПОДПИСЬ ---
 
-      # --- ИНДЕКСАЦИЯ REPO ---
-
-      - name: Update Pacman Database (Inside Arch Container)
+      - name: Update Pacman Database
         run: |
           docker run --rm \
             -v ${{ github.workspace }}/central-packages:/packages \
+            -v ~/.gnupg:/root/.gnupg \
             archlinux:latest \
             bash -c '
               cd /packages/archlinux/x86_64 && \
-              rm -f dexoron.db dexoron.files && \
-              shopt -s nullglob
-              packages=(*.pkg.tar.zst)
-              if [ ${#packages[@]} -gt 0 ]; then
-                echo "Found ${#packages[@]} Arch packages. Updating database..."
-                repo-add dexoron.db.tar.gz "${packages[@]}" && \
-                ln -sf dexoron.db.tar.gz dexoron.db && \
-                ln -sf dexoron.files.tar.gz dexoron.files
-              else
-                echo "No .pkg.tar.zst files found. Skipping."
-              fi
+              packages=(*.pkg.tar.zst) && \
+              repo-add --sign dexoron.db.tar.gz "${packages[@]}" && \
+              ln -sf dexoron.db.tar.gz dexoron.db && \
+              ln -sf dexoron.files.tar.gz dexoron.files
             '
+      - name: Fix GPG permissions after Docker
+        run: sudo chown -R runner:runner ~/.gnupg
 
       - name: Update Debian APT Repository Index
         run: |
           sudo apt-get update && sudo apt-get install -y dpkg-dev
           cd central-packages/debian
+          dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
           
-          shopt -s nullglob
-          deb_packages=(*.deb)
+          echo "Origin: Dexoron Packages" > Release
+          echo "Label: Dexoron Packages" >> Release
+          echo "Suite: stable" >> Release
+          echo "Codename: stable" >> Release
+          echo "Architectures: amd64" >> Release
+          echo "Components: main" >> Release
+          echo "Description: Dexoron binary package repository" >> Release
+          echo "Date: $(date -uR)" >> Release
+          echo "SHA256:" >> Release
+          echo " $(sha256sum Packages.gz | awk '{print $1" "$2}')" >> Release
           
-          if [ ${#deb_packages[@]} -gt 0 ]; then
-            echo "Found ${#deb_packages[@]} Debian packages. Generating Packages.gz..."
-            # Генерируем индекс для плоского (flat) репозитория
-            dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
-          else
-            echo "No .deb files found. Skipping Debian index update."
-          fi
+          gpg --batch --yes --pinentry-mode loopback --local-user 74322D39483E9C9E8C86C0AA0770A5C2A2A82DAC --detach-sign --armor --output Release.gpg Release
+          gpg --batch --yes --pinentry-mode loopback --local-user 74322D39483E9C9E8C86C0AA0770A5C2A2A82DAC --clearsign --output InRelease Release
 
       - name: Update Fedora DNF Repository Index
         run: |
           sudo apt-get update && sudo apt-get install -y createrepo-c
-          cd central-packages/rpm/x86_64
-          
-          shopt -s nullglob
-          rpm_packages=(*.rpm)
-          
-          if [ ${#rpm_packages[@]} -gt 0 ]; then
-            echo "Found ${#rpm_packages[@]} RPM packages. Generating repodata..."
-            # Пересоздаем метаданные для dnf
-            createrepo_c .
-          else
-            echo "No .rpm files found. Skipping Fedora index update."
-          fi
-
-      # --- ПУШ ИЗМЕНЕНИЙ ---
+          cd central-packages/fedora/x86_64
+          createrepo_c .
+          gpg --batch --yes --detach-sign --armor --output repodata/repomd.xml.asc repodata/repomd.xml
 
       - name: Push to dexoron/packages
         run: |
           cd central-packages
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          
-          # Проверяем изменения во всех трех целевых папках
-          if [ -n "$(git status --porcelain)" ]; then
-            git add archlinux/ debian/ rpm/
-            git commit -m "chore: update repositories index (arch, debian, rpm)"
+          git add .
+          if ! git diff --cached --quiet; then
+            git commit -m "chore: update and sign repositories"
             git push
-          else
-            echo "No changes detected in repository databases."
           fi

.github/workflows/release.yml

@@ -408,9 +408,10 @@ jobs:
         with:
           usesh: true
           run: |
-            export PATH="/usr/pkg/bin:/usr/pkg/sbin:$PATH"
             pkg_add rust perl gmake
-            export MAKE=gmake
+            mkdir -p /tmp/bin
+            ln -sf /usr/pkg/bin/gmake /tmp/bin/make
+            export PATH="/tmp/bin:/usr/pkg/bin:/usr/pkg/sbin:$PATH"
             cargo build --release
 
       - name: Prepare NetBSD Artifact

install.sh

@@ -61,7 +61,7 @@ select_channel() {
     echo "Choose channel:"
     echo "  1) Latest stable release (default)"
     echo "  2) Latest dev (pre-release)"
-    read -r -p "Enter 1 or 2 [1]: " choice
+    read -r -p "Enter 1 or 2 [1]: " choice < /dev/tty
 
     case "${choice:-1}" in
         1) CHANNEL="stable" ;;
@@ -74,7 +74,7 @@ select_install_mode() {
     echo "Choose installation mode:"
     echo "  1) Download prebuilt binary from GitHub Release (recommended)"
     echo "  2) Build from git"
-    read -r -p "Enter 1 or 2 [1]: " choice
+    read -r -p "Enter 1 or 2 [1]: " choice < /dev/tty
 
     case "${choice:-1}" in
         1) INSTALL_MODE="release" ;;
@@ -215,4 +215,4 @@ main() {
     log "Log saved to $LOGFILE"
 }
 
-main "$@"
+main "$@"