Skip to content

Conversation

@toratora
Copy link
Contributor

Before this change diskspace command only output formatted non-JSON. Now JSON is output, respecting --nojson flag.

Before this change tunnel ls only output formatted JSON, now it uses convertToJSONString to output JSON, and respects --nojson flag outputting formatted non-JSON.

Before this change devmode get output only non-JSON. Now JSON is output, respecting --nojson flag.

Removed extraneous nil check before exitIfError

…without --nojson flag

remove extranous nil check before exitIfError
@aluedeke
Copy link
Collaborator

@toratora could you pelase resolve the conflicts?

…ithub.com:toratora/go-ios into json-output-for-diskspace-tunnel-devmode-commands
@toratora
Copy link
Contributor Author

@aluedeke Done. Rebased on top of main branch to include my help text formatting changes.

@aluedeke
Copy link
Collaborator

@toratora This PR needs a rebase against main to resolve conflicts in the help text section of main.go. The functional code changes look good - just the documentation formatting needs to be resolved.

Mark Knasiak added 2 commits January 26, 2026 08:22
…without --nojson flag

remove extranous nil check before exitIfError
…ithub.com:toratora/go-ios into json-output-for-diskspace-tunnel-devmode-commands
@toratora
Copy link
Contributor Author

@aluedeke Rebased on top of main again. Looks like all checks passed.

@aluedeke aluedeke merged commit b2388c1 into danielpaulus:main Jan 27, 2026
3 checks passed
@toratora toratora deleted the json-output-for-diskspace-tunnel-devmode-commands branch January 27, 2026 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants