From 2dba1092a01a83caaf82d0309c263260f2cc4fdd Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 9 Nov 2021 17:45:19 -0500 Subject: Remove hardcoded cubbies.scad reference --- shopenscad.sh | 6 +++--- 1 file 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 () { } strip_after_hidden () { - echo "$1" |sed -n '/\/\* \[Hidden\] \*\//q;p' cubbies.scad + sed -n '/\/\* \[Hidden\] \*\//q;p' "$1" } strip_trailing () { @@ -182,8 +182,8 @@ main() VALUES+="$(val_to_filename "$val")${val_sep}" ALL+="${var}=$(val_to_filename "$val")${var_sep}" fi; - done < <(echo "$(cat "$SCAD_FILE")" | - strip_multiline_comments |strip_after_hidden |strip_nonassignments |strip_trailing_semicolon) + done < <(strip_after_hidden $SCAD_FILE | \ + strip_multiline_comments |strip_nonassignments |strip_trailing_semicolon) if [ "$PRINT_VARS" ]; then for k in "${!SCAD[@]}"; do -- cgit v1.2.3