From 781ed2e57e0b0100ffa00a4f65d6700149fa5cf4 Mon Sep 17 00:00:00 2001 From: sawka Date: Wed, 17 Jan 2024 14:52:49 -0800 Subject: [PATCH] updated build-helper.yml --- .github/workflows/build-helper.yml | 2 +- waveshell/pkg/shellapi/bashparser.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-helper.yml b/.github/workflows/build-helper.yml index 8007c121..a1a4ed32 100644 --- a/.github/workflows/build-helper.yml +++ b/.github/workflows/build-helper.yml @@ -89,7 +89,7 @@ jobs: mv out/make/zip/linux/x64/Wave-linux-x64-$WAVETERM_VERSION.zip buildtemp/waveterm-linux-x64-v$WAVETERM_VERSION.zip - uses: actions/upload-artifact@v4 with: - name: waveterm-build-linux-x64 + name: waveterm-builds path: buildtemp retention-days: 2 diff --git a/waveshell/pkg/shellapi/bashparser.go b/waveshell/pkg/shellapi/bashparser.go index 273aad84..01688af2 100644 --- a/waveshell/pkg/shellapi/bashparser.go +++ b/waveshell/pkg/shellapi/bashparser.go @@ -188,9 +188,9 @@ func bashParseDeclareOutput(state *packet.ShellState, declareBytes []byte, pvarB declareStr := string(declareBytes) r := bytes.NewReader(declareBytes) parser := syntax.NewParser(syntax.Variant(syntax.LangBash)) - file, err := parser.Parse(r, "aliases") + file, err := parser.Parse(r, "bash-declare-output") if err != nil { - return err + return fmt.Errorf("cannot parse bash declare output: %w", err) } var firstParseErr error declMap := make(map[string]*DeclareDeclType) @@ -293,7 +293,7 @@ func bashAssocArrayVarToMap(d *DeclareDeclType) (map[string]string, error) { parser := syntax.NewParser(syntax.Variant(syntax.LangBash)) file, err := parser.Parse(r, "assocdecl") if err != nil { - return nil, err + return nil, fmt.Errorf("parsing bash assoc-array value: %w", err) } if len(file.Stmts) != 1 { return nil, fmt.Errorf("invalid assoc-array parse (multiple stmts)")