diff options
author | Steven <steven.vasilogianis@gmail.com> | 2021-11-09 17:45:19 -0500 |
---|---|---|
committer | Steven <steven.vasilogianis@gmail.com> | 2021-11-09 17:45:19 -0500 |
commit | 2dba1092a01a83caaf82d0309c263260f2cc4fdd (patch) | |
tree | c1f523466b37008eb7e041072d420429dfdf2112 | |
parent | 2eefd096122d569e244fd84dee9a02920fd87499 (diff) |
Remove hardcoded cubbies.scad reference
-rwxr-xr-x | shopenscad.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shopenscad.sh b/shopenscad.sh index 6d85de6..ddb320d 100755 --- a/shopenscad.sh +++ b/shopenscad.sh | |||
@@ -142,7 +142,7 @@ strip_last_char () { | |||
142 | } | 142 | } |
143 | 143 | ||
144 | strip_after_hidden () { | 144 | strip_after_hidden () { |
145 | echo "$1" |sed -n '/\/\* \[Hidden\] \*\//q;p' cubbies.scad | 145 | sed -n '/\/\* \[Hidden\] \*\//q;p' "$1" |
146 | } | 146 | } |
147 | 147 | ||
148 | strip_trailing () { | 148 | strip_trailing () { |
@@ -182,8 +182,8 @@ main() | |||
182 | VALUES+="$(val_to_filename "$val")${val_sep}" | 182 | VALUES+="$(val_to_filename "$val")${val_sep}" |
183 | ALL+="${var}=$(val_to_filename "$val")${var_sep}" | 183 | ALL+="${var}=$(val_to_filename "$val")${var_sep}" |
184 | fi; | 184 | fi; |
185 | done < <(echo "$(cat "$SCAD_FILE")" | | 185 | done < <(strip_after_hidden $SCAD_FILE | \ |
186 | strip_multiline_comments |strip_after_hidden |strip_nonassignments |strip_trailing_semicolon) | 186 | strip_multiline_comments |strip_nonassignments |strip_trailing_semicolon) |
187 | 187 | ||
188 | if [ "$PRINT_VARS" ]; then | 188 | if [ "$PRINT_VARS" ]; then |
189 | for k in "${!SCAD[@]}"; do | 189 | for k in "${!SCAD[@]}"; do |