diff --git a/.gitignore b/.gitignore index 0f1ae37..0fc100f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /OdfEdit.egg-info /venv +OdfEdit.cfg diff --git a/README.md b/README.md index 1df8fc7..2a62914 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ Releases notes can be found in github : https://github.com/GrandOrgue/OdfEdit/re Way to run directly the script file : - install Python >=3.10 on your computer (from https://www.python.org/downloads/ to make sure it contains tkinter) + - on Fedora Linux 43, run `sudo dnf install python3-tkinter python3-pillow-tk` + - on Ubuntu Linux 25.10, run `sudo apt update; sudo apt install python3-venv python3-tk cmake libjpeg-dev zlib1g-dev libtiff-dev libfreetype-dev liblcms2-dev libwebp-dev libopenjp2-7-dev tcl-dev tk-dev python3-dev` - clone this repository or download its contents (https://github.com/GrandOrgue/OdfEdit/archive/refs/heads/main.zip) - install and run the application with one of the following methods: - automated: diff --git a/install.sh b/install.sh index 256929f..3cb8cd3 100755 --- a/install.sh +++ b/install.sh @@ -23,7 +23,7 @@ fi # Step 2: Create new venv # --------------------------- echo "Creating virtual environment..." -$PYTHON_BIN -m venv "$VENV_DIR" +$PYTHON_BIN -m venv "$VENV_DIR" --system-site-packages # --------------------------- # Step 3: Activate venv @@ -34,6 +34,12 @@ source "$VENV_DIR/bin/activate" # Step 4: Install ODFEdit dependencies # --------------------------- echo "Installing ODFEdit dependencies..." +if ! python3 -c "from PIL import ImageTk" 2>/dev/null; then + echo "Pillow missing or ImageTk unavailable, installing from source..." + pip install --force-reinstall --no-binary :all: pillow +else + echo "Pillow with ImageTk is already installed." +fi pip install . echo "ODFEdit setup complete!"