Update app-vscode.sh

I was getting this error:

wget -qO- https://omakub.org/install | bash
________                  __        ___.
\_____  \   _____ _____  |  | ____ _\_ |__
 /   |   \ /     \__   \ |  |/ /  |  \ __ \
/    |    \  Y Y  \/ __ \|    <|  |  / \_\ \
\_______  /__|_|  (____  /__|_ \____/|___  /
        \/      \/     \/     \/         \/

=> Omakub is for fresh Ubuntu 24.04+ installations only!

Begin installation (or abort with ctrl+c)...
E: Conflicting values set for option Signed-By regarding source https://packages.microsoft.com/repos/code/ stable: /etc/apt/keyrings/packages.microsoft.gpg != /usr/share/keyrings/microsoft.gpg
E: The list of sources could not be read.


The Problem I Faced

  When I first tried to run the installation, I immediately ran into a persistent error from your system's package manager, apt.

  The core of the problem was a conflict in your software sources. The repository for Microsoft VS Code was defined in more than one place, and these definitions were secured with two different, conflicting GPG keys. This created a
  deadlock; apt would refuse to do anything until the conflict was resolved, which in turn caused the installation script to fail right at the start.

  My initial attempts to fix this weren't working because I was placing the cleanup logic in scripts that were being called too late in the process. The error was happening before my fixes could even run.

  The Change I Made

  After realizing the timing was the issue, I corrected my approach.

  I pinpointed the exact script that was triggering the error: install/desktop/app-vscode.sh. I then modified this file to perform a comprehensive cleanup at the very beginning, before it could do anything else.

  The logic I added to the start of that script now does the following:
   1. It actively searches for and removes any apt source file on your system that mentions the conflicting Microsoft repository.
   2. It explicitly removes both of the GPG keys that were causing the conflict.
   3. Finally, it runs sudo apt-get update to confirm that the fix was successful.

  By placing this robust cleanup process in the correct script, I ensured that the conflict is resolved at the precise moment necessary, allowing the installation to proceed on a clean and stable foundation.

Author: neidiom

install/desktop/app-vscode.sh

@@ -1,15 +1,59 @@
 #!/bin/bash
 
+# Temporarily disable exit on error to run a robust cleanup process.
+set +e
+
+echo "--- Running VS Code Pre-installation Cleanup ---"
+
+# Find and remove ANY apt source file mentioning the conflicting repository.
+CONFLICTING_FILES=$(grep -lr "packages.microsoft.com/repos/code" /etc/apt/sources.list.d/ /etc/apt/sources.list 2>/dev/null)
+if [ -n "$CONFLICTING_FILES" ]; then
+    echo "Found conflicting repository files. Removing them..."
+    echo "$CONFLICTING_FILES" | sudo xargs -r rm -f
+    echo "Removed: $CONFLICTING_FILES"
+fi
+
+# Remove both potential GPG keys if they exist.
+if [ -f "/usr/share/keyrings/microsoft.gpg" ]; then
+    echo "Removing old GPG key..."
+    sudo rm -f /usr/share/keyrings/microsoft.gpg
+fi
+if [ -f "/etc/apt/keyrings/packages.microsoft.gpg" ]; then
+    echo "Removing new GPG key..."
+    sudo rm -f /etc/apt/keyrings/packages.microsoft.gpg
+fi
+
+# Refresh apt lists and check if the conflict is resolved.
+echo "Refreshing package lists to verify the fix..."
+sudo apt-get update -y
+APT_EXIT_CODE=$?
+
+# Re-enable exit on error for the rest of the script.
+set -e
+
+if [ $APT_EXIT_CODE -ne 0 ]; then
+    echo "--------------------------------------------------------------------"
+    echo "FATAL: APT conflict could not be resolved automatically."
+    echo "The installation of VS Code cannot proceed."
+    echo "--------------------------------------------------------------------"
+    exit 1
+fi
+
+echo "--- Cleanup Successful. Proceeding with VS Code installation. ---"
+
+# Now, proceed with a clean installation of the VS Code repository.
 cd /tmp
-wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >packages.microsoft.gpg
+wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
 sudo install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
-echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" | sudo tee /etc/apt/sources.list.d/vscode.list >/dev/null
+echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" | sudo tee /etc/apt/sources.list.d/vscode.list > /dev/null
 rm -f packages.microsoft.gpg
 cd -
 
-sudo apt update -y
-sudo apt install -y code
+# Update package list again and install VS Code
+sudo apt-get update -y
+sudo apt-get install -y code
 
+# Configure VS Code
 mkdir -p ~/.config/Code/User
 cp ~/.local/share/omakub/configs/vscode.json ~/.config/Code/User/settings.json