From 3c7307ed4815d236667d5857a7abb2d0f63b2011 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Mon, 12 May 2025 07:08:48 -0400 Subject: [PATCH] Fix Nala repository setup in setup.sh - Changed Nala installation approach to use more reliable methods - First try to use Nala from standard repositories if available - Fall back to Ubuntu PPA if not available in standard repos - Removed reliance on the Volian repository key that was causing 404 errors --- setup/setup.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/setup/setup.sh b/setup/setup.sh index d5fd5ce..4953981 100755 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -18,10 +18,19 @@ echo -e "${YELLOW}Setting up apt repositories...${NC}" # Install prerequisites sudo apt-get install -y wget gpg apt-transport-https -# Setup Nala repository +# Setup Nala repository - Try multiple methods echo -e "${YELLOW}Setting up Nala repository...${NC}" -curl -fsSL https://deb.volian.org/volian/scar.key | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/volian-archive-scar.gpg -echo "deb [arch=$(dpkg --print-architecture)] https://deb.volian.org/volian/ scar main" | sudo tee /etc/apt/sources.list.d/volian-archive-scar.list > /dev/null + +# First check if Nala is available in standard repositories (newer Ubuntu versions) +if apt-cache show nala &>/dev/null; then + echo -e "${GREEN}Nala is available in standard repositories${NC}" +else + # Try Ubuntu PPA as an alternative + echo -e "${YELLOW}Trying Nala from Ubuntu PPA...${NC}" + sudo apt-get update + sudo apt-get install -y software-properties-common + sudo add-apt-repository -y ppa:volitank/ppa +fi # Setup VS Code repository echo -e "${YELLOW}Setting up VS Code repository...${NC}"