Skip to content

Commit

Permalink
release 1.19
Browse files Browse the repository at this point in the history
  • Loading branch information
jnweiger committed Dec 26, 2016
1 parent 6a05047 commit fc90743
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
2 changes: 2 additions & 0 deletions distribute/distribute.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
echo "Determining Version:"
VERSION=$(echo '<xml height="0"/>' | python ../sendto_silhouette.py --version /dev/stdin)

test -e /usr/bin/xpath || sudo apt-get install libxml-xpath-perl
#
# grep Version ../*.inx
xpath -q -e '//param[@name="about_version"]/text()' ../sendto_silhouette.inx
echo "Version should be: \"$VERSION\""
Expand Down
2 changes: 1 addition & 1 deletion sendto_silhouette.inx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Always use the least amount of blade possible.
<page name='about' _gui-text='About'>
<param name="about_who" type="description">inkscape-silhouette extension from https://github.com/jnweiger/inkscape-silhouette by Jürgen Weigert [[email protected]] and contributors</param>
<!-- Keep in sync with sendto_silhouette.py line 78 __version__ = ... -->
<param name="about_version" type="description">Version 1.18</param>
<param name="about_version" type="description">Version 1.19</param>
</page>
</param>

Expand Down
4 changes: 3 additions & 1 deletion sendto_silhouette.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,10 @@
# Limit pressure to 18. 19 or 20 make the machine
# scroll forward backward for several minutes.
# Support document unit inches. https://github.com/fablabnbg/inkscape-silhouette/issues/19
# 2016-12-18, jw, v1.19 -- support for dashed lines added. Thanks to mehtank
# https://github.com/fablabnbg/inkscape-silhouette/pull/33

__version__ = '1.18' # Keep in sync with sendto_silhouette.inx ca line 79
__version__ = '1.19' # Keep in sync with sendto_silhouette.inx ca line 79
__author__ = 'Juergen Weigert <[email protected]> and contributors'

import sys, os, shutil, time, logging, tempfile
Expand Down
14 changes: 12 additions & 2 deletions silhouette/Graphtec.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,20 @@
raise e2;

try:
if usb.version_info[0] < 1:
print("Your python usb module appears to be "+str(usb.version_info)+" -- We need version 1.x", file=sys.stderr)
try:
usb_vi = usb.version_info[0]
usb_vi_str = str(usb.version_info)
except AttributeError:
usb_vi = 0
usb_vi_str = 'unknown'

if usb_vi < 1:
print("Your python usb module appears to be "+usb_vi_str+" -- We need version 1.x", file=sys.stderr)
print("For Debian 8 try:\n echo > /etc/apt/sources.list.d/backports.list 'deb http://ftp.debian.org debian jessie-backports main\n apt-get update\n apt-get -t jessie-backports install python-usb", file=sys.stderr)
print("\n\n\n", file=sys.stderr)
print("For Ubuntu 14.04try:\n pip install pyusb --upgrade", file=sys.stderr)
print("\n\n\n", file=sys.stderr)
sys.exit(1)
sys.exit(1)
# try my own wrapper instead.
# import UsbCoreMini as usb
Expand Down

0 comments on commit fc90743

Please sign in to comment.