Merge branch 'master' of cryptonomic.net:public_git/cubbies

3 files changed, 9 insertions, 5 deletions

diff --git a/BOSL2 b/BOSL2
-Subproject 7431007a6d3d3c969cb4c582917ccefd06422d9
+Subproject 9f5214adc0476f29aa9437dc401c01e8f1cd5da
diff --git a/cubbies.scad b/cubbies.scad
index 99b2f4d..0531a7f 100644
--- a/cubbies.scad
+++ b/cubbies.scad
@@ -69,7 +69,6 @@ module both () {
     cubby_bottom(cubby_width, cubby_depth);
     left(((cubby_width + cubby_height) / 2) + (tab_height * 2) + gap)
         cubby_side(cubby_depth, cubby_height, screw_tabs);
-}
 
 module cubby_bottom (width, depth) {
     rot(90) yrot(90) color("blue") bottom_wall() yrot(90) down(tab_height / 2) {
diff --git a/shopenscad.sh b/shopenscad.sh
index 4e3de98..996d405 100755
--- a/shopenscad.sh
+++ b/shopenscad.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
-# parse a .scad file and generate an openscad command with all its var=value's
-# parameterized into -D options, which can be overriden with shell variables.
+# shopenscad.sh: parse a .scad file and generate an openscad command with all
+# its var=value's parameterized into -D options, which can be overriden with
+# shell variables.
 #
 # Usage examples:
 #
@@ -162,6 +163,10 @@ fi
 
 #openscad_str="$openscad "$scad_file" "$output_params" -o $(strip_trailing "-" "${values_only}").stl"
 openscad_str="$openscad '$scad_file' "$output_params" -o '$output_filename'"
+#openscad_str="$openscad '$scad_file' "$output_params" -o '${all}.stl'"
+
+# ${open_filename//'/'\\''}
+
 
 echo "${openscad_str}"
 $print_vars || ! $run && ! $interactive &&  exit
@@ -175,5 +180,5 @@ if $interactive; then
         *) run=false ;;
     esac
 fi
-
-$run &&  eval "$(echo "$openscad_str")"
+#sed -nel <<< "$openscad_str"
+$run &&  eval "$openscad_str"