thePR0M3TH3AN/seedPass
1
0
Fork 0
mirror of https://github.com/PR0M3TH3AN/SeedPass.git synced 2025-09-09 15:58:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #656 from PR0M3TH3AN/codex/fix-install-script-errors-for-all-os

Browse Source 
Fix install script missing cairo
This commit is contained in:
thePR0M3TH3AN
2025-07-19 13:57:42 -04:00
committed by GitHub
parent 2832b0150e 64c174c385
commit a9d1d2f242
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -251,6 +251,10 @@ for your platform:
# Linux # Linux
pip install toga-gtk pip install toga-gtk
# If you see build errors about "cairo" on Linux, install the cairo
# development headers using your package manager, e.g.:
sudo apt-get install libcairo2 libcairo2-dev
# Windows # Windows
pip install toga-winforms pip install toga-winforms

3
docs/docs/content/01-getting-started/06-gui_adapter.md
View File

@@ -23,6 +23,9 @@ backend for your platform:
# Linux # Linux
pip install toga-gtk pip install toga-gtk
# If installation fails with cairo errors, install libcairo2-dev or the
# cairo development package using your distro's package manager.
# Windows # Windows
pip install toga-winforms pip install toga-winforms

15
scripts/install.sh
View File

@@ -86,13 +86,18 @@ main() {
# 3. Install OS-specific dependencies # 3. Install OS-specific dependencies
print_info "Checking for build dependencies..." print_info "Checking for build dependencies..."
if [ "$OS_NAME" = "Linux" ]; then if [ "$OS_NAME" = "Linux" ]; then
if command -v apt-get &> /dev/null; then sudo apt-get update && sudo apt-get install -y build-essential pkg-config xclip; if command -v apt-get &> /dev/null; then
elif command -v dnf &> /dev/null; then sudo dnf groupinstall -y "Development Tools" && sudo dnf install -y pkg-config xclip; sudo apt-get update && sudo apt-get install -y build-essential pkg-config xclip libcairo2 libcairo2-dev
elif command -v pacman &> /dev/null; then sudo pacman -Syu --noconfirm base-devel pkg-config xclip; elif command -v dnf &> /dev/null; then
else print_warning "Could not detect package manager. Ensure build tools and pkg-config are installed."; fi sudo dnf groupinstall -y "Development Tools" && sudo dnf install -y pkg-config cairo cairo-devel xclip
elif command -v pacman &> /dev/null; then
sudo pacman -Syu --noconfirm base-devel pkg-config cairo xclip
else
print_warning "Could not detect package manager. Ensure build tools, cairo, and pkg-config are installed."
fi
elif [ "$OS_NAME" = "Darwin" ]; then elif [ "$OS_NAME" = "Darwin" ]; then
if ! command -v brew &> /dev/null; then print_error "Homebrew not installed. See https://brew.sh/"; fi if ! command -v brew &> /dev/null; then print_error "Homebrew not installed. See https://brew.sh/"; fi
brew install pkg-config brew install pkg-config cairo
fi fi
# 4. Clone or update the repository # 4. Clone or update the repository

2
src/seedpass/cli.py
View File

@@ -3,6 +3,7 @@ from typing import Optional, List
import json import json
import typer import typer
import sys
from seedpass.core.manager import PasswordManager from seedpass.core.manager import PasswordManager
from seedpass.core.entry_types import EntryType from seedpass.core.entry_types import EntryType
@@ -368,6 +369,7 @@ def entry_modify(
) )
except ValueError as e: except ValueError as e:
typer.echo(str(e)) typer.echo(str(e))
sys.stdout.flush()
raise typer.Exit(code=1) raise typer.Exit(code=1)