BogaudioModules

commit dea9bbbcd0a6b94a44097061e077f514bd54b6bb
parent 8d100130f2d38e8d63c1c4a38993baa6110f2c7e
Author: Matt Demanett <matt@demanett.net>
Date:   Tue, 28 Jul 2020 19:34:34 -0400

Update svg scripts to work with Inkscape 1.0.

Diffstat:
M
scripts/svg_render.sh
 | 
8
++------
M
scripts/svg_widgets.rb
 | 
4
++--

2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/scripts/svg_render.sh b/scripts/svg_render.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-INKSCAPE="/Applications/Inkscape.app/Contents/Resources/bin/inkscape"
+INKSCAPE="/Applications/Inkscape.app/Contents/MacOS/inkscape"
 
 if [ "x$1" = "x" ]
 then
@@ -26,10 +26,6 @@ fi
 TMP_FILE="/tmp/svg_render_tmp.svg"
 
 < "$1" perl -e '$s = do { local $/; <STDIN> }; $s =~ s/<use[^<>\/]+id="\w+_(PARAM|INPUT|OUTPUT|LIGHT|WIDGET)"[^<>\/]+(\/\>|<\/use>)//gs; print $s' > "$TMP_FILE" && \
-  "$INKSCAPE" -f "$TMP_FILE" \
-  --verb EditSelectAll --verb SelectionUnGroup \
-  --verb EditSelectAll --verb EditUnlinkClone \
-  --verb EditSelectAll  --verb ObjectToPath \
-  --verb FileSave --verb FileQuit && \
+  "$INKSCAPE" -g --actions='EditSelectAll;SelectionUnGroup;EditSelectAll;EditUnlinkClone;EditSelectAll;ObjectToPath;FileSave;FileQuit' "$TMP_FILE" 2> /dev/null && \
   cp "$TMP_FILE" "$OUT_FILE" && \
   rm "$TMP_FILE"
diff --git a/scripts/svg_widgets.rb b/scripts/svg_widgets.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 
-INKSCAPE = '/Applications/Inkscape.app/Contents/Resources/bin/inkscape'
+INKSCAPE = '/Applications/Inkscape.app/Contents/MacOS/inkscape'
 OUTPUT_DECIMAL_PLACES=2
 
 hpp_template = <<HPP_TEMPLATE
@@ -166,7 +166,7 @@ unless File.exist?(svg_file)
 end
 svg_file = File.absolute_path(svg_file)
 
-lines = `#{INKSCAPE} -z -S #{svg_file}`
+lines = `#{INKSCAPE} -S #{svg_file}`
 # FIXME: check for error.
 
 Widget = Struct.new(:id, :x, :y, :width, :height) do