Merge pull request #144 from Githubguy132010/fixes

Enhance build and release workflows, improve logging and configuration handling, and refine sound management scripts

Author: Githubguy132010

.github/workflows/build.yml

@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ env.PACMAN_CACHE }}
-          key: archlinux-pacman-${{ github.run_id }}
+          key: archlinux-pacman-${{ hashFiles('packages.x86_64', 'bootstrap_packages.x86_64') }}
           restore-keys: |
             archlinux-pacman-
 

.github/workflows/release-notes.yml

@@ -112,4 +112,47 @@ jobs:
             } > $TEMP_NOTES_FILE
           fi
           
-          cat $TEMP_NOTES_FILE
+          cat $TEMP_NOTES_FILE
+          
+      - name: Update release with detailed notes
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+            const path = require('path');
+            
+            // Read the detailed release notes
+            const notesPath = path.join(process.env.GITHUB_WORKSPACE, 'DETAILED_RELEASE_NOTES.md');
+            let releaseNotes = '';
+            
+            try {
+              releaseNotes = fs.readFileSync(notesPath, 'utf8');
+            } catch (error) {
+              console.log('Could not read detailed release notes, using fallback');
+              releaseNotes = `## Changes in ${process.env.CURRENT_TAG}\n\nDetailed release notes could not be generated.`;
+            }
+            
+            // Get the current release
+            const { owner, repo } = context.repo;
+            const releases = await github.rest.repos.listReleases({
+              owner,
+              repo,
+              per_page: 1
+            });
+            
+            if (releases.data.length === 0) {
+              console.log('No releases found');
+              return;
+            }
+            
+            const currentRelease = releases.data[0];
+            
+            // Update the release with detailed notes
+            await github.rest.repos.updateRelease({
+              owner,
+              repo,
+              release_id: currentRelease.id,
+              body: releaseNotes
+            });
+            
+            console.log(`Updated release ${currentRelease.tag_name} with detailed notes`);

airootfs/etc/systemd/system/no-beep.service

@@ -2,8 +2,9 @@
 Description=Disable system beeps
 Documentation=https://github.com/Githubguy132010/Arch-Linux-without-the-beeps
 DefaultDependencies=no
-Before=sysinit.target
+Before=sysinit.target shutdown.target
 After=local-fs.target
+Conflicts=shutdown.target
 
 [Service]
 Type=oneshot

airootfs/usr/local/bin/livecd-sound

@@ -8,7 +8,7 @@ usage() {
     Usage: livecdsound [OPTION]
     OPTIONS
         -u, --unmute      unmute all sound cards
-        -p, --pick        select a card for  speetch output
+        -p, --pick        select a card for speech output
         -h, --help        Show this usage message
 
 _EOF_
@@ -183,8 +183,9 @@ play_on_card() {
 # using auditory feedback.
 pick_a_card() {
     set -f
-    usable_cards="$(list_non_pcsp_cards)"
-    num_usable_cards="$(wc -w <<<"$usable_cards")"
+    local usable_cards
+    readarray -t usable_cards <<< "$(list_non_pcsp_cards)"
+    local num_usable_cards=${#usable_cards[@]}
 
     if (( num_usable_cards == 1 )); then
         systemd-cat -t "livecdsound" printf "Only one sound card is detected\n"

profiledef.sh

@@ -21,8 +21,8 @@ if [ "$(nproc)" -gt 2 ]; then
   # For multi-core systems: use XZ with bcj x86 filter for better compression
   airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
 else
-  # For single/dual-core systems: use the same options but may be slower
-  airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '75%')
+  # For single/dual-core systems: use safe fixed dictionary size
+  airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '512K')
 fi
 
 bootstrap_tarball_compression=('zstd' '-c' '-T0' '--auto-threads=logical' '--long' '-19')

scripts/entrypoint.sh

@@ -40,21 +40,25 @@ build_iso() {
 
     # Disable PC speaker module in airootfs if present
     if [ -f "airootfs/etc/modprobe.d/nobeep.conf" ] \
-       && grep -q "pcspkr" airootfs/etc/modprobe.d/nobeep.conf 2>/dev/null \
-       && grep -q "snd_pcsp" airootfs/etc/modprobe.d/nobeep.conf 2>/dev/null; then
+       && grep -q "pcspkr" "airootfs/etc/modprobe.d/nobeep.conf" 2>/dev/null \
+       && grep -q "snd_pcsp" "airootfs/etc/modprobe.d/nobeep.conf" 2>/dev/null; then
         log "PC speaker already disabled in airootfs configuration."
     else
         log "Disabling PC speaker in airootfs configuration..."
-        mkdir -p airootfs/etc/modprobe.d/
-        echo "blacklist pcspkr" > airootfs/etc/modprobe.d/nobeep.conf
-        echo "blacklist snd_pcsp" >> airootfs/etc/modprobe.d/nobeep.conf
+        mkdir -p "airootfs/etc/modprobe.d/"
+        echo "blacklist pcspkr" > "airootfs/etc/modprobe.d/nobeep.conf"
+        echo "blacklist snd_pcsp" >> "airootfs/etc/modprobe.d/nobeep.conf"
     fi
 
     # Create a custom hook to disable beeps in various config files
     if [ ! -f "airootfs/usr/share/libalpm/hooks/99-no-beep.hook" ]; then
         log "Creating custom hook to disable beeps..."
-        mkdir -p airootfs/usr/share/libalpm/hooks/
-        cat > airootfs/usr/share/libalpm/hooks/99-no-beep.hook << 'EOF'
+if ! mkdir -p "airootfs/usr/share/libalpm/hooks/" 2>/dev/null; then
+    warn "Failed to create hooks directory, continuing..."
+else
+    cat > "airootfs/usr/share/libalpm/hooks/99-no-beep.hook" << 'EOF'
+        else
+            cat > "airootfs/usr/share/libalpm/hooks/99-no-beep.hook" << 'EOF'
 [Trigger]
 Type = Package
 Operation = Install
@@ -66,21 +70,35 @@ Description = Disabling system beeps in various configuration files...
 When = PostTransaction
 Exec = /bin/bash -c "mkdir -p /etc/modprobe.d && echo 'blacklist pcspkr' > /etc/modprobe.d/nobeep.conf && echo 'blacklist snd_pcsp' >> /etc/modprobe.d/nobeep.conf && if [ -f /etc/inputrc ]; then grep -q 'set bell-style none' /etc/inputrc || echo 'set bell-style none' >> /etc/inputrc; fi"
 EOF
+        fi
     fi
 
     # Add settings to disable terminal bell in bash
     if [ ! -f "airootfs/etc/skel/.bashrc" ]; then
         log "Adding bash configuration to disable terminal bell..."
-        mkdir -p airootfs/etc/skel/
-        echo "# Disable terminal bell" > airootfs/etc/skel/.bashrc
-        echo "bind 'set bell-style none'" >> airootfs/etc/skel/.bashrc
+if ! mkdir -p "airootfs/etc/skel/" 2>/dev/null; then
+    warn "Failed to create skel directory, continuing..."
+else
+    echo "# Disable terminal bell" > "airootfs/etc/skel/.bashrc"
+    echo "bind 'set bell-style none'" >> "airootfs/etc/skel/.bashrc"
+fi
+        else
+            echo "# Disable terminal bell" > "airootfs/etc/skel/.bashrc"
+            echo "bind 'set bell-style none'" >> "airootfs/etc/skel/.bashrc"
+        fi
     fi
 
     # Set bell-style none in global inputrc
     if [ ! -f "airootfs/etc/inputrc" ]; then
         log "Setting bell-style none in global inputrc..."
-        mkdir -p airootfs/etc
-        echo "set bell-style none" > airootfs/etc/inputrc
+if ! mkdir -p "airootfs/etc" 2>/dev/null; then
+    warn "Failed to create etc directory, continuing..."
+else
+    echo "set bell-style none" > "airootfs/etc/inputrc"
+fi
+        else
+            echo "set bell-style none" > "airootfs/etc/inputrc"
+        fi
     fi
 
     # Optimize the build process with parallel compression

scripts/package_tracking/config.conf

@@ -9,7 +9,7 @@ LOG_LEVEL="INFO"  # Options: DEBUG, INFO, WARNING, ERROR
 DATA_DIR="/tmp/package-versions"
 
 # Update settings
-REPOS="core extra community multilib"  # Repositories to check for updates
+REPOS="core extra multilib"  # Repositories to check for updates (community merged into extra)
 CHECK_INTERVAL=86400  # Update interval in seconds (86400 = 24 hours)
 NOTIFY="true"  # Whether to display notifications
 

scripts/package_tracking/track_package_updates.sh

@@ -8,11 +8,20 @@
 set -e
 
 # Default configuration options (can be overridden by config file)
-CONFIG_FILE="/etc/package_tracking/config.conf"
-LOG_FILE="/var/log/package_tracking.log"
+# Use more portable paths that work in containers
+CONFIG_FILE="${XDG_CONFIG_HOME:-${HOME}/.config}/package_tracking/config.conf"
+if [ -w "/etc" ] 2>/dev/null; then
+    CONFIG_FILE="/etc/package_tracking/config.conf"
+fi
+
+LOG_FILE="${XDG_STATE_HOME:-${HOME}/.local/state}/package_tracking.log"
+if [ -w "/var/log" ] 2>/dev/null; then
+    LOG_FILE="/var/log/package_tracking.log"
+fi
+
 LOG_LEVEL="INFO"  # Options: DEBUG, INFO, WARNING, ERROR
 DATA_DIR="/tmp/package-versions"
-REPOS="core extra community multilib"
+REPOS="core extra multilib"  # Updated to remove deprecated 'community' repo
 CHECK_INTERVAL=86400  # 24 hours in seconds
 NOTIFY="true"
 TIMEOUT=30  # Connection timeout in seconds
@@ -33,10 +42,17 @@ UPDATES_FILE="${DATA_DIR}/package_updates.md"
 LAST_RUN_FILE="${DATA_DIR}/last_run.timestamp"
 
 # Create directory for storing log files if it doesn't exist
-mkdir -p "$(dirname "$LOG_FILE")" 2>/dev/null || true
+if ! mkdir -p "$(dirname "$LOG_FILE")" 2>/dev/null; then
+    # Fall back to current directory if we can't create the log directory
+    LOG_FILE="./package_tracking.log"
+    echo "Warning: Could not create log directory, using current directory" >&2
+fi
 
 # Create data directory if it doesn't exist
-mkdir -p "${DATA_DIR}" 2>/dev/null || true
+if ! mkdir -p "${DATA_DIR}" 2>/dev/null; then
+    echo "Error: Could not create data directory: ${DATA_DIR}" >&2
+    exit 1
+fi
 
 # Load configuration if exists
 if [ -f "$CONFIG_FILE" ]; then
@@ -175,6 +191,7 @@ get_current_versions() {
         log "DEBUG" "Found $total_packages packages to process"
 
         > "${CURRENT_VERSIONS_FILE}.tmp" # Create or truncate the temporary file
+chmod 600 "${CURRENT_VERSIONS_FILE}.tmp" 2>/dev/null || log "WARNING" "Could not set restrictive permissions on temporary file ${CURRENT_VERSIONS_FILE}.tmp"
 
         while IFS= read -r pkg; do
             # Skip empty lines and comments

scripts/select-mirrors.sh

@@ -18,7 +18,15 @@ log "Selecting fastest mirrors..."
 
 # Create mirror directory if it doesn't exist
 mkdir -p airootfs/etc/pacman.d/
-cp /etc/pacman.d/mirrorlist airootfs/etc/pacman.d/mirrorlist.backup 2>/dev/null || true
+
+# Backup existing mirrorlist if it exists
+if [ -f /etc/pacman.d/mirrorlist ]; then
+    cp /etc/pacman.d/mirrorlist airootfs/etc/pacman.d/mirrorlist.backup 2>/dev/null || {
+        warn "Failed to backup mirrorlist, continuing without backup"
+    }
+else
+    warn "No system mirrorlist found to backup"
+fi
 
 # Install reflector if not already installed
 if ! command -v reflector &> /dev/null; then