From ed8cdfa2c1352fdc506c745dcbd5d95f8ebee4bc Mon Sep 17 00:00:00 2001 From: Moini Date: Wed, 22 Nov 2017 18:24:20 +0100 Subject: Move Ubuntu install script, change message to user, update README accordingly. --- README.md | 2 +- bin/install_ubuntu.sh | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ install.sh | 56 --------------------------------------------------- 3 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 bin/install_ubuntu.sh delete mode 100644 install.sh diff --git a/README.md b/README.md index 3fd4a6aa..4543aef9 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Okay, not really. I'm pretty terrible at GUIs, but I found this nifty inkscape ## Quick Setup On Ubuntu (and derivative Linux distributions) -Download the [extension's archive file](https://github.com/lexelby/inkscape-embroidery/archive/master.zip) and unpack the zip archive. Then, on a terminal, run the installation (and update) script by entering the command `sh install.sh`. The script will ask for your password to be able to install new software, remove any Inkscape snap packages that may be installed, and to update Inkscape to the current version. Restart Inkscape after the script has executed to see the changes take effect. You can also run the script again when you later want to update the extension (and Inkscape). +Download the [extension's archive file](https://github.com/lexelby/inkscape-embroidery/archive/master.zip) and unpack the zip archive. Then, on a terminal, run the installation (and update) script from the archive's `bin` directory by first changing into that directory with `cd /inkscape-embroidery-master/bin` and then entering the command `sh install.sh`. The script will ask for your password to be able to install new software, remove any Inkscape snap packages that may be installed, and to update Inkscape to the current version. Restart Inkscape after the script has executed to see the changes take effect. You can also run the script again when you later want to update the extension (and Inkscape). Currently, the optional conversion program still needs to be installed manually, if desired. diff --git a/bin/install_ubuntu.sh b/bin/install_ubuntu.sh new file mode 100644 index 00000000..e7fce203 --- /dev/null +++ b/bin/install_ubuntu.sh @@ -0,0 +1,56 @@ +# 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 . + +#!/bin/bash + +# we want to be in the tmp directory +cd /tmp + +# delete old snap Inkscape (we really don't want a snap!) +sudo snap remove inkscape + +# add stable-daily repository +sudo add-apt-repository ppa:inkscape.dev/stable + +# refresh package list +sudo apt-get update + +# install everything we need +sudo apt-get install inkscape pip unzip + +# download lexelby's embroidery extension +wget https://github.com/lexelby/inkscape-embroidery/archive/master.zip + +# unzip files +unzip master.zip -d /tmp + +# change into new directory +cd inkscape-embroidery-master + +# install requirements (only with user privileges, not system-wide) +pip install --user -r requirements.txt + +# create extensions directory if doesn't exist yet +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. +Any previously installed Inkscape snap packages have been removed." diff --git a/install.sh b/install.sh deleted file mode 100644 index b5240cad..00000000 --- a/install.sh +++ /dev/null @@ -1,56 +0,0 @@ -# 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 . - -#!/bin/bash - -# we want to be in the tmp directory -cd /tmp - -# delete old snap Inkscape (we really don't want a snap!) -sudo snap remove inkscape - -# add stable-daily repository -sudo add-apt-repository ppa:inkscape.dev/stable - -# refresh package list -sudo apt-get update - -# install everything we need -sudo apt-get install inkscape pip unzip - -# download lexelby's embroidery extension -wget https://github.com/lexelby/inkscape-embroidery/archive/master.zip - -# unzip files -unzip master.zip -d /tmp - -# change into new directory -cd inkscape-embroidery-master - -# install requirements (only with user privileges, not system-wide) -pip install --user -r requirements.txt - -# create extensions directory if doesn't exist yet -mkdir -p $HOME/.config/inkscape/extensions - -# copy all *.py and *.inx files there -cp *.py *.inx $HOME/.config/inkscape/extensions - -echo "Lexelby's embroidery extension and its dependencies have been installed, -and your Inkscape version is now up to date. -Any previously installed Inkscape snap packages have been removed." -- cgit v1.2.3