Skip to content

Commit 2a4a92f

Browse files
author
MochiOS Team
committed
fix: symlink→real db for gh raw, discover autostart nuke, kde trust disabled
1 parent 3160e16 commit 2a4a92f

5 files changed

Lines changed: 37 additions & 16 deletions

File tree

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[General]
2+
ConfirmLaunch=false
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[Desktop Entry]
2+
Type=Application
3+
Name=Nuke Discover from Taskbar
4+
Exec=/usr/lib/mochiinstall/nuke-discover.sh
5+
Terminal=false
6+
NoDisplay=true
7+
X-KDE-autostart-after=plasma-shell

‎archiso-mochios/airootfs/home/mochi/.zshrc‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,11 @@ if [ -z "$MOCHI_LIVE_INIT" ]; then
88
reflector --latest 20 --protocol https --sort rate --save /etc/pacman.d/mirrorlist &>/dev/null &
99
fi
1010

11-
# nuke discover from everywhere
11+
# early cleanup of discover
1212
rm -f "$HOME/Desktop/org.kde.discover.desktop" \
1313
"$HOME/Desktop/discover.desktop" \
1414
"/usr/share/applications/org.kde.discover.desktop" 2>/dev/null
15-
16-
# nuke discover from the taskbar — wait for plasma config then sanitize
17-
PBC="$HOME/.config/plasma-org.kde.plasma.desktop-appletsrc"
18-
for i in $(seq 1 30); do
19-
if [ -f "$PBC" ]; then
20-
sed -i '/[Dd]iscover/d' "$PBC" 2>/dev/null
21-
sed -i 's/,[[:space:]]*org\.kde\.discover[^,]*//g; s/org\.kde\.discover[^,]*,[[:space:]]*//g; s/org\.kde\.discover[^,]*//g' "$PBC" 2>/dev/null
22-
# also strip from all other config files that might pin it
23-
for cfg in "$HOME"/.config/plasma* "$HOME"/.config/kde*; do
24-
[ -f "$cfg" ] && sed -i '/[Dd]iscover/d' "$cfg" 2>/dev/null
25-
done
26-
break
27-
fi
28-
sleep 1
29-
done
15+
# autostart script nuke-discover handles the taskbar after plasma loads
3016

3117
echo "the installer should open shortly..."
3218

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env bash
2+
# wait for plasma config, then strip discover from the taskbar
3+
PBC="$HOME/.config/plasma-org.kde.plasma.desktop-appletsrc"
4+
for i in $(seq 1 30); do
5+
if [ -f "$PBC" ]; then
6+
sed -i '/[Dd]iscover/d' "$PBC" 2>/dev/null
7+
sed -i 's/,[[:space:]]*org\.kde\.discover[^,]*//g; s/org\.kde\.discover[^,]*,[[:space:]]*//g; s/org\.kde\.discover[^,]*//g' "$PBC" 2>/dev/null
8+
for cfg in "$HOME"/.config/plasma* "$HOME"/.config/kde*; do
9+
[ -f "$cfg" ] && sed -i '/[Dd]iscover/d' "$cfg" 2>/dev/null
10+
done
11+
break
12+
fi
13+
sleep 1
14+
done

‎build.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,18 @@ GNUPGHOME="$GNUPGHOME" repo-add --sign os/x86_64/mochi.db.tar.zst os/x86_64/moch
157157
GNUPGHOME="$GNUPGHOME" repo-add --sign os/x86_64/mochi.db.tar.zst os/x86_64/zen-browser-[0-9]*.pkg.tar.zst
158158
GNUPGHOME="$GNUPGHOME" repo-add --sign os/x86_64/mochi.db.tar.zst os/x86_64/sober-[0-9]*.pkg.tar.zst
159159

160+
echo "==> replacing symlinks with real files (GitHub raw doesn't follow symlinks)..."
161+
cd "$REPO_DIR/os/x86_64"
162+
for f in mochi.db mochi.files; do
163+
if [ -L "$f" ]; then
164+
real="${f}.tar.zst"
165+
rm -f "$f"
166+
cp "$real" "$f"
167+
# also handle sig if it exists
168+
[ -f "${real}.sig" ] && cp "${real}.sig" "${f}.sig"
169+
fi
170+
done
171+
160172
echo "==> staging public key for ISO..."
161173
if [ -f "$REPO_DIR/pubkey/mochios-key.pub" ]; then
162174
mkdir -p "$ISO_DIR/airootfs/usr/share/mochios"

0 commit comments

Comments
 (0)