Skip to content

Commit 8b4f3d1

Browse files
Fix ISO build workflow syntax errors and configuration issues
Co-authored-by: Githubguy132010 <[email protected]>
1 parent d21c835 commit 8b4f3d1

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

.github/workflows/validate-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
DOCKER_BUILDKIT: 1
1717
PACMAN_CACHE: /tmp/pacman-cache
1818
WORKSPACE: /workdir
19-
BUILD_DIR: /workdir/workdir
19+
BUILD_DIR: /workdir/work
2020
OUTPUT_DIR: /workdir/out
2121

2222
jobs:

pacman.conf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ Architecture = auto
3232
#UseSyslog
3333
# Color output enabled
3434
Color
35-
ILoveCandy # enable candy output
36-
ParallelDownloads = 64 # increased for build speed
35+
# Enable candy output for better visual feedback
36+
ILoveCandy
37+
# Increased parallel downloads for build speed
38+
ParallelDownloads = 64
3739
# We cannot check disk space from within a chroot environment
3840
#CheckSpace # enable disk space checks
3941
#VerbosePkgLists

scripts/entrypoint.sh

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@ build_iso() {
5353
# Create a custom hook to disable beeps in various config files
5454
if [ ! -f "airootfs/usr/share/libalpm/hooks/99-no-beep.hook" ]; then
5555
log "Creating custom hook to disable beeps..."
56-
if ! mkdir -p "airootfs/usr/share/libalpm/hooks/" 2>/dev/null; then
57-
warn "Failed to create hooks directory, continuing..."
58-
else
59-
cat > "airootfs/usr/share/libalpm/hooks/99-no-beep.hook" << 'EOF'
56+
if ! mkdir -p "airootfs/usr/share/libalpm/hooks/" 2>/dev/null; then
57+
warn "Failed to create hooks directory, continuing..."
6058
else
6159
cat > "airootfs/usr/share/libalpm/hooks/99-no-beep.hook" << 'EOF'
6260
[Trigger]
@@ -76,12 +74,8 @@ EOF
7674
# Add settings to disable terminal bell in bash
7775
if [ ! -f "airootfs/etc/skel/.bashrc" ]; then
7876
log "Adding bash configuration to disable terminal bell..."
79-
if ! mkdir -p "airootfs/etc/skel/" 2>/dev/null; then
80-
warn "Failed to create skel directory, continuing..."
81-
else
82-
echo "# Disable terminal bell" > "airootfs/etc/skel/.bashrc"
83-
echo "bind 'set bell-style none'" >> "airootfs/etc/skel/.bashrc"
84-
fi
77+
if ! mkdir -p "airootfs/etc/skel/" 2>/dev/null; then
78+
warn "Failed to create skel directory, continuing..."
8579
else
8680
echo "# Disable terminal bell" > "airootfs/etc/skel/.bashrc"
8781
echo "bind 'set bell-style none'" >> "airootfs/etc/skel/.bashrc"
@@ -91,11 +85,8 @@ fi
9185
# Set bell-style none in global inputrc
9286
if [ ! -f "airootfs/etc/inputrc" ]; then
9387
log "Setting bell-style none in global inputrc..."
94-
if ! mkdir -p "airootfs/etc" 2>/dev/null; then
95-
warn "Failed to create etc directory, continuing..."
96-
else
97-
echo "set bell-style none" > "airootfs/etc/inputrc"
98-
fi
88+
if ! mkdir -p "airootfs/etc" 2>/dev/null; then
89+
warn "Failed to create etc directory, continuing..."
9990
else
10091
echo "set bell-style none" > "airootfs/etc/inputrc"
10192
fi

0 commit comments

Comments
 (0)