fix installer bugs: mochi repo in iso, mochiboot staged, discover cleanup, stale lock check, +x on desktop file

Author: MochiOS Team

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

@@ -3,18 +3,21 @@ if [ -z "$MOCHI_LIVE_INIT" ]; then
     export MOCHI_LIVE_INIT=1
     echo "welcome to mochios live!"
 
-    # clean up ghost discover from desktop + taskbar
+    # nuke discover from desktop
     rm -f "$HOME/Desktop/org.kde.discover.desktop" \
           "$HOME/Desktop/discover.desktop" 2>/dev/null
-    PBC="$HOME/.config/plasma-org.kde.plasma.desktop-appletsrc"
-    if [ -f "$PBC" ]; then
-        sed -i '/discover/d' "$PBC" 2>/dev/null
-    fi
 
-    # trust the installer desktop file so kde doesn't nag
-    if [ -f "$HOME/Desktop/mochiinstall.desktop" ]; then
-        kioclient exec "trash:trustDesktopFile file://$HOME/Desktop/mochiinstall.desktop" 2>/dev/null || true
-    fi
+    # nuke discover from the taskbar — wait for plasma config then sanitize
+    PBC="$HOME/.config/plasma-org.kde.plasma.desktop-appletsrc"
+    for i in $(seq 1 10); do
+        if [ -f "$PBC" ]; then
+            sed -i '/[Dd]iscover/d' "$PBC" 2>/dev/null
+            # also strip it from pinnedApplications lists
+            sed -i 's/,[[:space:]]*org\.kde\.discover[^,]*//g; s/org\.kde\.discover[^,]*,[[:space:]]*//g; s/org\.kde\.discover[^,]*//g' "$PBC" 2>/dev/null
+            break
+        fi
+        sleep 1
+    done
 
     echo "the installer should open shortly..."
 

archiso-mochios/pacman.conf

@@ -49,4 +49,6 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-# [mochi] repo is added by the installer, not needed at build time
+[mochi]
+SigLevel = Optional TrustAll
+Server = https://github.com/iluxz/MochiOS/raw/main/repo/os/x86_64

build.sh

@@ -159,9 +159,9 @@ fi
 echo "==> staging mochi packages for installer..."
 mkdir -p "$ISO_DIR/airootfs/opt/mochi-pkgs"
 if [ "$NIGHTLY" = "true" ]; then
-  STAGED_PKGS="mochi mochiinstall mochios-defaults mochios-branding-nightly mochi-abroot"
+  STAGED_PKGS="mochi mochiinstall mochios-defaults mochios-branding-nightly mochi-abroot mochiboot"
 else
-  STAGED_PKGS="mochi mochiinstall mochios-defaults mochios-branding mochi-abroot"
+  STAGED_PKGS="mochi mochiinstall mochios-defaults mochios-branding mochi-abroot mochiboot"
 fi
 for pkg in $STAGED_PKGS; do
   cp "$REPO_DIR/os/x86_64/"$pkg-[0-9]*.pkg.tar.zst "$ISO_DIR/airootfs/opt/mochi-pkgs/"

mochiinstall_wrapper

@@ -15,8 +15,14 @@ if os.geteuid() != 0:
 
 LOCK = "/tmp/mochiinstall.lock"
 if os.path.exists(LOCK):
-    print("mochiinstall already running")
-    sys.exit(0)
+    try:
+        pid = int(open(LOCK).read().strip())
+        os.kill(pid, 0)  # check if process exists
+        print("mochiinstall already running")
+        sys.exit(0)
+    except (ValueError, ProcessLookupError):
+        pass  # stale lock, remove it
+    os.unlink(LOCK)
 
 open(LOCK, "w").write(str(os.getpid()))
 try: