fix installation script for Ubuntu 16.04, add script to install libembroidery-convert, adapt README

2 files changed, 69 insertions, 4 deletions

diff --git a/bin/install_ubuntu.sh b/bin/install_ink_embroidery_Ubuntu.sh
index e7fce203..0215ddbc 100644
--- a/bin/install_ubuntu.sh
+++ b/bin/install_ink_embroidery_Ubuntu.sh
@@ -24,6 +24,8 @@ cd /tmp
 # delete old snap Inkscape (we really don't want a snap!)
 sudo snap remove inkscape
 
+echo "Adding Inkscape stable apt-repository"
+
 # add stable-daily repository
 sudo add-apt-repository ppa:inkscape.dev/stable
 
@@ -31,7 +33,7 @@ sudo add-apt-repository ppa:inkscape.dev/stable
 sudo apt-get update
 
 # install everything we need
-sudo apt-get install inkscape pip unzip
+sudo apt-get install inkscape python-pip unzip dpkg-dev build-essential python2.7-dev libjpeg-dev libtiff-dev libsdl1.2-dev libgstreamer-plugins-base0.10-dev libgstreamer-plugins-base1.0-dev libnotify-dev freeglut3 freeglut3-dev libsm-dev libgtk2.0-dev libwebkitgtk-dev libgtk-3-dev libwebkitgtk-3.0-dev
 
 # download lexelby's embroidery extension
 wget https://github.com/lexelby/inkscape-embroidery/archive/master.zip
@@ -42,8 +44,11 @@ unzip master.zip -d /tmp
 # change into new directory
 cd inkscape-embroidery-master
 
+# upgrade pip
+pip install -U pip
+
 # install requirements (only with user privileges, not system-wide)
-pip install --user -r requirements.txt
+pip install --user --upgrade --force-reinstall --no-cache-dir -r requirements.txt
 
 # create extensions directory if doesn't exist yet
 mkdir -p $HOME/.config/inkscape/extensions
@@ -51,6 +56,8 @@ mkdir -p $HOME/.config/inkscape/extensions
 # copy all *.py and *.inx files there
 cp *.py *.inx $HOME/.config/inkscape/extensions
 
-echo "The Inkscape embroidery extension (https://github.com/lexelby/inkscape-embroidery)
-and its dependencies have been installed, and your Inkscape version is now up to date.
+echo "============================
+
+The Inkscape embroidery extension (https://github.com/lexelby/inkscape-embroidery) and its dependencies have been installed, and your Inkscape version is now up to date.
+
 Any previously installed Inkscape snap packages have been removed."
diff --git a/bin/install_libembroidery-convert_Ubuntu.sh b/bin/install_libembroidery-convert_Ubuntu.sh
new file mode 100644
index 00000000..4c4e5564
--- /dev/null
+++ b/bin/install_libembroidery-convert_Ubuntu.sh
@@ -0,0 +1,58 @@
+# This file is part of the Inkscape extension 'inkscape-embroidery', 
+# an extension for machine embroidery design using Inkscape.
+
+# Copyright (C) 2017 Maren Hachmann
+
+# inkscape-embroidery is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# inkscape-embroidery is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with inkscape-embroidery.  If not, see <http://www.gnu.org/licenses/>.
+
+#!/bin/bash
+
+# make sure we're in tmp directory
+cd /tmp
+
+# install qmake (which is needed to configure libembroidery)
+sudo apt-get install qt4-qmake
+
+# get the source for embroidermodder
+wget https://github.com/Embroidermodder/Embroidermodder/archive/master.zip -O /tmp/embroidermodder-master.zip
+
+# unzip files
+unzip embroidermodder-master.zip -d /tmp
+
+# switch into directory of the library we're interested in
+cd Embroidermodder-master/libembroidery-convert/
+
+# prepare build
+qmake
+
+# build
+make
+
+# create destination folder (which will automatically be in the PATH environment variable)
+mkdir -p $HOME/bin/
+
+# copy created library there
+cp ./libembroidery-convert $HOME/bin/
+
+echo "==========================
+
+Use the embroidery file format conversion tool like this:
+
+libembroidery-convert file_to_read file_to_write
+
+To get a list of supported embroidery formats, enter:
+
+libembroidery-convert --help
+
+Run this script again to update your libembroidery-convert version."