Skip to content

Commit fdd3a8a

Browse files
fix: improve CachyOS kernel hook robustness and branding consistency
- Implement robust fallback loop for CachyOS kernel package suffixes (-3, -2, -1) with curl verification. - Standardize branding tagline to "Switch to simple" across Plymouth and MOTD. - Rename "Keyboard Shortcuts" to "KibaOS Shortcuts" in kiba-welcome script. - Fix trailing whitespace in kiba.yml workflow. Co-authored-by: christopherfoxjr <213370400+christopherfoxjr@users.noreply.github.com>
1 parent edfc74a commit fdd3a8a

1 file changed

Lines changed: 25 additions & 14 deletions

File tree

.github/workflows/kiba.yml

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,31 @@ jobs:
128128
IMAGE_URL=$(echo "$RELEASE_INFO" | grep '"browser_download_url":' | grep "linux-image-psycachy" | grep "amd64.deb" | head -1 | sed -E 's/.*"([^"]+)".*/\1/')
129129
HEADERS_URL=$(echo "$RELEASE_INFO" | grep '"browser_download_url":' | grep "linux-headers-psycachy" | grep "amd64.deb" | head -1 | sed -E 's/.*"([^"]+)".*/\1/')
130130
131-
if [ -n "$IMAGE_URL" ]; then
132-
curl -LO "$IMAGE_URL"
133-
else
134-
echo "WARNING: Could not find CachyOS image URL, using fallback pattern"
135-
curl -LO "https://github.com/$REPO/releases/download/$LATEST_TAG/linux-image-psycachy_${LATEST_TAG}-3_amd64.deb"
131+
if [ -z "$IMAGE_URL" ]; then
132+
echo "WARNING: Could not find CachyOS image URL, using fallback pattern search"
133+
for sfx in -3 -2 -1; do
134+
TEST_URL="https://github.com/$REPO/releases/download/$LATEST_TAG/linux-image-psycachy_${LATEST_TAG}${sfx}_amd64.deb"
135+
if curl --head --silent --fail "$TEST_URL" >/dev/null; then
136+
IMAGE_URL="$TEST_URL"
137+
break
138+
fi
139+
done
136140
fi
137141
138-
if [ -n "$HEADERS_URL" ]; then
139-
curl -LO "$HEADERS_URL"
140-
else
141-
echo "WARNING: Could not find CachyOS headers URL, using fallback pattern"
142-
curl -LO "https://github.com/$REPO/releases/download/$LATEST_TAG/linux-headers-psycachy_${LATEST_TAG}-3_amd64.deb"
142+
if [ -z "$HEADERS_URL" ]; then
143+
echo "WARNING: Could not find CachyOS headers URL, using fallback pattern search"
144+
for sfx in -3 -2 -1; do
145+
TEST_URL="https://github.com/$REPO/releases/download/$LATEST_TAG/linux-headers-psycachy_${LATEST_TAG}${sfx}_amd64.deb"
146+
if curl --head --silent --fail "$TEST_URL" >/dev/null; then
147+
HEADERS_URL="$TEST_URL"
148+
break
149+
fi
150+
done
143151
fi
144152
153+
if [ -n "$IMAGE_URL" ]; then curl -LO "$IMAGE_URL"; fi
154+
if [ -n "$HEADERS_URL" ]; then curl -LO "$HEADERS_URL"; fi
155+
145156
# Install
146157
apt install -y ./*.deb || {
147158
echo "WARNING: CachyOS Kernel install failed, falling back to stock"
@@ -289,7 +300,7 @@ jobs:
289300
plasma-workspace-wallpapers
290301
plasma-discover
291302
plasma-discover-backend-flatpak
292-
303+
293304
sddm
294305
sddm-theme-debian-breeze
295306
plasma-nm
@@ -438,7 +449,7 @@ jobs:
438449
cx - label.image.GetWidth() / 2,
439450
logo.y + logo.scaled.GetHeight() + 16, 1);
440451
441-
tag.image = Image.Text("Switch to Simple", 0.384, 0.447, 0.643, 1, "Sans 13");
452+
tag.image = Image.Text("Switch to simple", 0.384, 0.447, 0.643, 1, "Sans 13");
442453
tag.sprite = Sprite(tag.image);
443454
tag.sprite.SetPosition(
444455
cx - tag.image.GetWidth() / 2,
@@ -1237,7 +1248,7 @@ jobs:
12371248
| . \| | |_) | (_| | |_| |___) |
12381249
|_|\_\_|_.__/ \__,_|\___/|____/
12391250
1240-
Welcome to KibaOS — Switch to Simple
1251+
Welcome to KibaOS — Switch to simple
12411252
12421253
EOF
12431254
@@ -1275,7 +1286,7 @@ jobs:
12751286
break
12761287
;;
12771288
"shortcuts")
1278-
(zenity --list --title="Keyboard Shortcuts" \
1289+
(zenity --list --title="KibaOS Shortcuts" \
12791290
--window-icon="/usr/share/kibaos/logo.png" \
12801291
--width=450 --height=500 \
12811292
--image-column=1 --column=" " --column="Action" --column="Shortcut" \

0 commit comments

Comments
 (0)