summaryrefslogtreecommitdiff
path: root/shopenscad.sh
diff options
context:
space:
mode:
Diffstat (limited to 'shopenscad.sh')
-rwxr-xr-xshopenscad.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/shopenscad.sh b/shopenscad.sh
index 996d405..075290d 100755
--- a/shopenscad.sh
+++ b/shopenscad.sh
@@ -117,7 +117,7 @@ output_params=""
117default_output_filename="" 117default_output_filename=""
118all="" 118all=""
119values_only="" 119values_only=""
120val_sep="=" 120val_sep="-"
121var_sep="," 121var_sep=","
122 122
123declare -A scad 123declare -A scad
@@ -139,7 +139,7 @@ while IFS= read -r line; do
139 scad[$var]="$val" 139 scad[$var]="$val"
140 output_params+="-D '$var=$val' " 140 output_params+="-D '$var=$val' "
141 values_only+="$(val_to_filename "$val")${val_sep}" 141 values_only+="$(val_to_filename "$val")${val_sep}"
142 all+="${var}${val_sep}$(val_to_filename "$val")${var_sep}" 142 all+="${var}=$(val_to_filename "$val")${var_sep}"
143 fi; 143 fi;
144done < <(echo "$(cat "$scad_file")" | 144done < <(echo "$(cat "$scad_file")" |
145 strip_comments |strip_after_hidden |strip_nonassignments |strip_trailing_semicolon) 145 strip_comments |strip_after_hidden |strip_nonassignments |strip_trailing_semicolon)
@@ -152,7 +152,7 @@ if $print_vars; then
152 done; echo 152 done; echo
153fi 153fi
154 154
155all=$(strip_trailing "$val_sep" "$all") 155#all=$(strip_trailing "$val_sep" "$all")
156values_only=$(strip_trailing "$val_sep" "$values_only") 156values_only=$(strip_trailing "$val_sep" "$values_only")
157 157
158default_output_filename="$(strip_trailing "-" "${values_only}").stl" 158default_output_filename="$(strip_trailing "-" "${values_only}").stl"
@@ -180,5 +180,5 @@ if $interactive; then
180 *) run=false ;; 180 *) run=false ;;
181 esac 181 esac
182fi 182fi
183#sed -nel <<< "$openscad_str" 183
184$run && eval "$openscad_str" 184$run && eval "$(echo "$openscad_str")"