summaryrefslogtreecommitdiff
path: root/scripts/context/ruby/pstopdf.rb
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/context/ruby/pstopdf.rb')
-rw-r--r--scripts/context/ruby/pstopdf.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/context/ruby/pstopdf.rb b/scripts/context/ruby/pstopdf.rb
index 96469beb4..197f83961 100644
--- a/scripts/context/ruby/pstopdf.rb
+++ b/scripts/context/ruby/pstopdf.rb
@@ -288,7 +288,7 @@ class Commands
if FileTest.directory?(donepath) && FileTest.directory?(resultpath) then
- resultname = resultpath + '/' + filename.sub(/\..*$/,'') + '.pdf'
+ resultname = resultpath + '/' + filename.sub(/\.[^\.]*$/,'') + '.pdf'
@commandline.setoption('inputpath', filepath)
@commandline.setoption('outputpath', resultpath)
@@ -360,7 +360,7 @@ class Commands
suffix = @commandline.option('suffix')
inpfilename = "#{inppath}#{filename}"
- outfilename = "#{outpath}#{prefix}#{filename.sub(/\.(.*?)$/, '')}#{suffix}.pdf"
+ outfilename = "#{outpath}#{prefix}#{filename.sub(/\.([^\.]*?)$/, '')}#{suffix}.pdf"
magick.setvariable('inputfile' , inpfilename)
magick.setvariable('outputfile', outfilename)
@@ -383,7 +383,7 @@ class Commands
suffix = @commandline.option('suffix')
inpfilename = "#{inppath}#{filename}"
- outfilename = "#{outpath}#{prefix}#{filename.sub(/\.(.*?)$/, '')}#{suffix}.pdf"
+ outfilename = "#{outpath}#{prefix}#{filename.sub(/\.([^\.]*?)$/, '')}#{suffix}.pdf"
inkscape.setvariable('inputfile' , inpfilename)
inkscape.setvariable('outputfile', outfilename)
@@ -451,7 +451,7 @@ class Commands
elsif ghostscript.psfile?(filename) then
- if filename =~ /(.*)\.(.*?)$/io then
+ if filename =~ /(.*)\.([^\.]*?)$/io then
filename, filesuffix = $1, $2
else
filesuffix = 'eps'