notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Should allow import filenames w/ spaces now.

Browse source 
(SourceForge #1527884, we got poked about it via Ubuntu)
This commit is contained in:
William Kendrick 2009-06-13 21:27:41 +00:00
parent d5d90cb5c5
commit 02552571ce
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/CHANGES.txt
View file

@ -8,7 +8,7 @@ http://www.tuxpaint.org/
$Id$ $Id$
2009.June.11 (0.9.21) 2009.June.13 (0.9.21)
* New Starters: * New Starters:
------------- -------------
* Silver Frame * Silver Frame
@ -293,6 +293,10 @@ $Id$
Pere Pujal i Carabantes <pere@fornol.no-ip.org> and Pere Pujal i Carabantes <pere@fornol.no-ip.org> and
Albert Cahalan <albert@users.sf.net> Albert Cahalan <albert@users.sf.net>
* 'tuxpaint-import' script didn't support files with spaces. Fixed.
James Le Cuirot <jerseychewi@users.sourceforge.net>
2008.June.26 (0.9.20) 2008.June.26 (0.9.20)
* New translations: * New translations:
----------------- -----------------

8
src/tuxpaint-import.sh
View file

@ -5,7 +5,7 @@
# "Tux Paint Import" # "Tux Paint Import"
# Import an arbitrary GIF, JPEG or PNG into Tux Paint # Import an arbitrary GIF, JPEG or PNG into Tux Paint
# (c) Copyright 2002-2006, by Bill Kendrick and others # (c) Copyright 2002-2009, by Bill Kendrick and others
# bill@newbreedsoftware.com # bill@newbreedsoftware.com
# http://www.newbreedsoftware.com/tuxpaint/ # http://www.newbreedsoftware.com/tuxpaint/
@ -25,7 +25,7 @@
# (See COPYING.txt) # (See COPYING.txt)
# September 21, 2002 - August 12, 2006 # September 21, 2002 - June 13, 2009
SAVEDIR=$HOME/.tuxpaint SAVEDIR=$HOME/.tuxpaint
@ -145,13 +145,13 @@ for x in $(seq 1 $#)
do do
i="${!x}" i="${!x}"
if [ -e $i ]; then if [ -e "$i" ]; then
# Determine a filename for it: # Determine a filename for it:
NEWFILENAME=`date "+%Y%m%d%H%M%S"` NEWFILENAME=`date "+%Y%m%d%H%M%S"`
echo "$i -> $SAVEDIR/saved/$NEWFILENAME.png" echo "$i -> $SAVEDIR/saved/$NEWFILENAME.png"
# Convert and scale down, save as a temp file: # Convert and scale down, save as a temp file:
anytopnm $i | pnmscale -xysize $width $height > $TMPDIR/saved/$NEWFILENAME.ppm anytopnm "$i" | pnmscale -xysize $width $height > $TMPDIR/saved/$NEWFILENAME.ppm
# Place inside the correctly-sized canvas: # Place inside the correctly-sized canvas:
# FIXME: Center, instead of placing at upper right # FIXME: Center, instead of placing at upper right