test to [[ where available
#261
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fixes: - init.sh: fix a missing `-d` - github-download: fix a missing `-n` - mount-helper: fix a missing `-n` - setup-git: fix a missing `test`/`[[` - waiter: fix missing `-n` todos: - note this change of convention in the docs - see if there is an alternative for the sudo calls - review the PR to check if there were any errors
- add `is-(directory|file|missing|not-directory|present|readable)(.bash)?` - is-missing: fix incorrect help text on exit status
- mount-helper: fix missing `-n`, however seems better to just always fetch a single line here - debug-network: fix WIP commit using `[[` in a sh script, instead of `[`
- `while true` to `while :`, and `true` to `:` where appropriate - brew: compact a conditional - (choose|config-helper|confirm|echo-lines|is-empty-value|setup-(git|linux|mac|system)): compact an or conditional - is-suffix: update for `__substr` shim in `bash.bash` for bash v3 support - `is-dir`: move to deprecated, as there is now `is-directory`
balupton
commented
Oct 29, 2024
todos:
- choose: needs truncating of choose body, if too long, possible with `fs-rm` and `fs-trim` with large directory content listing: `eza -lA | sed -e '5,$d' -e '4,$s/.*/Truncated./'` is suitable, however our own command would work
- eval-helper: check if pending/success/failure messages are still going to TTY
- is-not-symlink: update copy and pasted tests to match its functionality
- consider renames of `echo-exit-affirmative`, `echo-exit-status`, `is-root`
changes:
- choose:
- optional will now cancel to nothing, only required cancels to defaults
- can now press R to revert to defaults
- dorothy:
- permissions action no longer trims junk files, as they are already git-ignored
- `fs-realpath`, `fs-structure`, `fs-trim`, `is-broken-symlink`, `is-directory`, `is-empty-directory`, `is-empty-file`, `is-file`, `is-missing`, `is-not-directory`, `is-not-symlink`, `is-present`, `is-readable`, `is-symlink`, `is-nonempty-file`:
- support `--(sudo|user|group)` arguments
- consistent internal structure
- add tests where appropriate
- `fs-rm`, `fs-trim`, `fs-structure`:
- rewrote `fs-rm` for new `fs-trim` command, with exact prompts on what to do, no longer overly complex and fragile
- rewrote `fs-structure` to prefer `exa`, comment out verbose `dust`/`du` handling as `exa` is better and more understandable for this use case, made perms and time toggles
- fs-temp:
- clarified touch functionality (will make directories, but not files, by default), make `--no-touch` not make directories
- add `fs-trim`:
- consolidated functionality from: `fs-rm`, `rm-junk`, `rm-modules`
- clear handling of symlinks
- add `is-broken-symlink`, `is-empty-directory`, `is-empty-file`, `is-not-symlink`, `is-file`, `is-not-symlink`, `is-symlink`:
- is-generic:
- change return status behaviour on multiple arguments to be consistent with others
- promoted `is-even` from beta commands
- add `setup-util-qpdf` for `pdf-decrypt`, and updated `pdf-decrypt` for modern covnentions
- sudo-helper:
- add `--[no-]sudo` flag, which if no and no user nor group, then no sudo is needed
fixes:
- choose: pressing escape/q to cancel now works again
- echo-values: fix help text being incorrect
- eval-helper: wrapping will now have wraps go to stdout
- get-terminal-theme: more accurate parsing of `COLORFGBG`
- is-admin: fix multiple users handling
- setup-dns: improve handling of bad interfaces fetch
renames and deprecations:
- `is-nonempty-string` to `is-not-whitespace`
- `is-empty-string` to `is-whitespace`
- `is-empty-ls` to `is-empty-directory`, turns out we had two commands doing the same thing
- `is-dir` to `is-directory`
- `is-either` to `is-needle`, `is-neither` to `! is-needle`
- `echo-if-empty` to `echo-with-whitespace-fallback`, added `echo-with-empty-fallback` for zero-length
- `echo-values` promoted from beta, used within `setup-dns`
- `fs-size` deprecated as it was the same as `fs-structure`; use `fs-structure` or `get-size` instead
- `rm-vmware` to `rm-vmware-fusion`
- `rm-junk` and `rm-modules` to `fs-trim --junk`
- deprecate `is-array-*` and `get-array-*` commands
- deprecate `is-exec`, `is-equal`, `rm-svn`, and `rm-sync` until there is a use case for them
linting:
- down: as `fs-temp` touch usage is now clarified, improve logic around mkdirp call
- fs-filename: use the new options help text format
- get-terminal-color-support: fix return status help text
- remove unnecessary `--status=0` in `eval-tester` calls
- improve wording of return statuses in help text
- improve wording around whether symlinks are considered or not in various commands
- added `Companion to ...` line to improve discovery of (related) commands and their functionality
balupton
force-pushed
the
dev/square-brackets
branch
from
2538a59 to
ccda6c8
Compare
- choose: add `--truncate-body` WIP - config-edit: `--editer=` to `--editor=` - add `echo-truncate-lines` WIP - eval-helper: shapeshifter will be enabled on `sudo-helper` by default - flush-dns, setup-util-docker, setup-util-xcode: fix formatting when sudo needed - fs-rm: rewrote for new `fs-trim` command - get-profile: `possesive-pronoun` to `possesive-pronoun` - git-helper: fix bad formatting on failures - is-present: speedier sudo checks, by first checking without sudo - sudo-helper: support `--optional` for speedier checks without sudo - mount-helper: fixed detection of forced unmount - add `setup-util-tor-browser` - styles: fix terminal title and resize not terminating
balupton
force-pushed
the
dev/square-brackets
branch
3 times, most recently
from
9f7e1e8 to
808f55c
Compare
balupton
force-pushed
the
dev/square-brackets
branch
from
808f55c to
b96a30f
Compare
balupton
force-pushed
the
dev/square-brackets
branch
from
5cc1ae7 to
839a82c
Compare
There was a problem hiding this comment.
Copilot reviewed 559 out of 576 changed files in this pull request and generated no suggestions.
Files not reviewed (17)
- .vscode/workspace.code-workspace: Language not supported
- commands.beta/convert-helper: Language not supported
- commands.beta/echo-affirmative: Language not supported
- commands.beta/echo-escape-special: Language not supported
- commands.beta/echo-exit-affirmative: Language not supported
- commands.beta/echo-exit-status: Language not supported
- commands.beta/echo-html-coder.recode: Language not supported
- commands.beta/echo-html-coder.textutil: Language not supported
- commands.beta/echo-html-coder.xmlstarlet: Language not supported
- commands.beta/echo-if-directory: Language not supported
- commands.beta/echo-if-executable: Language not supported
- commands.beta/echo-if-path: Language not supported
- commands.beta/echo-last-line: Language not supported
- commands.beta/echo-mkdir: Language not supported
- commands.beta/echo-non-affirmative: Language not supported
- commands.beta/echo-nonflags: Language not supported
- commands.beta/echo-nothing-or-fail: Language not supported
- add `echo-if-directory`, `echo-if-executable`, `echo-if-present`, `is-executable`, `is-writable` - `echo-if-file`, `fs-dequarantine` now consistent with other such helpers - fs-trim: fix bad filename code handling, use new `is-needle` flags - is-needle: add `--ignore-case`, `--all`, `--any` flags, and enforce expected arg usage - setup-dns: simplify `fs-rm` call as the extra stuff is no longer necessary - setup-util-bash: simplify `is-needle` call - echo-truncate-lines: move to beta, as no active users - setup-server: use fs helpers wherever appropriate - deprecate `echo-if-path` for `echo-if-present`
balupton
force-pushed
the
dev/square-brackets
branch
3 times, most recently
from
2e4f695 to
72339a7
Compare
balupton
force-pushed
the
dev/square-brackets
branch
2 times, most recently
from
dffa6fc to
dcb21f4
Compare
balupton
force-pushed
the
dev/square-brackets
branch
from
dcb21f4 to
13c335f
Compare
…or commands, so that `dorothy todos` can detect usage correctly
…` is now intelligent enough to handle escalation itself if needed
…emoving manual CLI paths
```
> nvm-env -- npm
++ '[' -z /Users/balupton/.nvm ']'
++ '[' -s /Users/balupton/.nvm/nvm.sh ']'
++ . /Users/balupton/.nvm/nvm.sh
+++ NVM_SCRIPT_SOURCE=']'
+++ '[' -z '' ']'
+++ export NVM_CD_FLAGS=
+++ NVM_CD_FLAGS=
+++ nvm_is_zsh
+++ '[' -n '' ']'
+++ '[' -z /Users/balupton/.nvm ']'
+++ case $NVM_DIR in
+++ unset NVM_SCRIPT_SOURCE
+++ nvm_process_parameters
+++ local NVM_AUTO_MODE
+++ NVM_AUTO_MODE=use
+++ '[' 0 -ne 0 ']'
+++ nvm_auto use
+++ local NVM_MODE
+++ NVM_MODE=use
+++ case "${NVM_MODE}" in
+++ local VERSION
+++ local NVM_CURRENT
++++ nvm_ls_current
++++ local NVM_LS_CURRENT_NODE_PATH
+++++ command which node
++++ NVM_LS_CURRENT_NODE_PATH=
++++ nvm_echo none
++++ command printf '%s\n' none
+++ NVM_CURRENT=none
+++ '[' _none = _none ']'
++++ nvm_resolve_local_alias default
++++ nvm_echo
++++ command printf '%s\n' ''
+++ VERSION=N/A
+++ '[' -n N/A ']'
+++ '[' _N/A '!=' _N/A ']'
+++ return 0
+ npm
env: node: No such file or directory
```
regression introduced from what appears to be a refactoring glitch in: - c4d1e1f - #254 - https://github.com/bevry/dorothy/blame/4f66b71111d819564db8e0e4130db88b8ac836dd/commands/ask - d605711#diff-472c231c97417631c7aed9672b65bbc7dc3c33ff032ee7324b7bb3bf97ce3a5cL345-L346 probably closes #265
molleweide
reviewed
Jan 28, 2025
|
these conventions need to be updated before merge: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
/close #265 #268
Using
[[ ... ]]instead oftestis a convention change that improves performance and resolves edge cases wheretest -n "$a" -a "$b" = "$c"fails whena='>'.This PR also features these highlights:
ask: fixed clearing issue /close Bug:askprompt is not clearing correctly, causing ask prompt and answer to duplicate and cursor to move in-between data #265is-*filesystem commands for filesystem interactions which use a newis-accessiblecommand to determine if a sudo escalation is needed, benefiting Improvement: smooth installation on non-root systems #233 and closes Suggestion: instead of requiringsudoforis-presentandis-missingfailures, test if assumptions are correct #268, full list of commands:is-accessibleis-broken-symlinkis-directoryis-empty-directoryis-empty-fileis-executableis-fileis-missingis-nonempty-fileis-not-directoryis-not-symlinkis-owneris-presentis-readableis-symlinkis-writableecho-if-directoryecho-if-executableecho-if-fileecho-if-presentfs-absolutefs-ownfs-dequarantinefs-parentsfs-realpathfs-structuregocryptfs-helpersecretfs-rm: completely rewritten for a superior experience, with revised functionality to simplify and secure its human and programmatic usage (such as insetup-dns), also supports--trashfs-structure: rewritten, and now used infs-own,fs-rm,fs-trim,gocryptfs-helper,is-same,setup-util,eject-allfs-trimto assist withfs-rmunder certain circumstanceschoose:--truncate-bodyfor when we allow the question's body/description/details to be truncated to make way for items, used byfs-rmandfs-trim, defaults to disabled--default-allfor defaulting to selection of everything, defaults to disabled--confirm-cancelwhich now defaults to enabledstyles.bashvalues for terminal title and resize modificationsrkey for reversion, along with the priorzkeydorothy:dnfecosystem changes breaking installation on dnf setupsinstallaction: cleaner removal.profilemodification if nobash,dash,kshlintandtestactions now sort files by most recent first, andtestaction will call the newgit-helper umtcommand and action on CI to ensure clone dates are correctcommandsaction: lists all the available commands, recommended now in post-install instructions, uses newecho-if-presentcommand, however doesn't yet usefs-structuretodosaction: support checking core and beta commands, correct detection of usage, correct error status reporting, clearer indication when help text is missing, fix missing and incorrect local varsis-ciinstead of an archaic techniquepermissionsaction: no longer trim junk files, as they are already git-ignoredsources/tests.bashfor assisting the fs commands with their testsis-ownercommand for detecting if a user or group has ownership of a pathis-rootcommand for detecting if a user is a root user (maybe one day this should support the root group as well)read-key: added a--continueoption for debugging, but most importantly reduced the subsequent timeout from0.0001to0.01to prevent situations where a key was read only partially and caused incorrect keys to be assumed, causing sayask,choose,confirmto interpret an escape key that wasn't actually pressedsetup-util:styles.bashinstead of callingecho-stylefor performancefs-rmflow for removing leftover and conflicting pathsrm_helper_confirmtorm_helper_whichto better explain its purposeecho_fallbacktolog_fallbackAPT_REPOhttpvshttpswarningfs-structurefor outputting when a download build glob fails$(... something that calls setup-util ...)`` does not get a bunch of install junk in the result, as was the case fortests.bashcalling ofsymlink-helper` which installed coreutils for realpathoutputpipe="$terminal_device_file"to whenuse_alt_screen_bufferwasnosudo-helper: add alternative values for--sudooption, to enable optional escalation under various circumstances, and simplified logicsymlink-helper: support--target=as alias for--existing=, and improve--quietand--verbosehandling to ensure outputs match expectations, and with nothing going to stdoutOther changes to the core:
--status=0option witheval-tester=~ ^(...|...)$instead of multiple== ... ||statements for easier human parsinginit.sh: fix a missing-dconfig-edit:--editerchanged to correct spelling of--editorcommand-working: addrmtrashto the exceptiondown:--progressoption that is enabled by default, except on CI where it is disabled by default which prevents progress bars from appearing on CIedit: don't outputNone of the configured editors were availableif there are no configured editors, such as the case on a new machine (review this later, as we may still want a warning, but a better warning on more specific certain situations)echo-style: fixed empty--=and--usage, the implementation seemed broken from the starteval-helper:sudo-helperautomatically as a shapeshifter, as it is impossible to know how many lines it used while attempting passwords, so impossible to clear it accurately in non-shapeshifter modeecho-revolving-doordon't output anything to stdout, as anything would not be correct as it would be truncatedflush-dns: use--shapeshifteron thesudo-helpercalls for interacting with dns responders to ensure it is all rendered correctlyfs-dequarantine: use/usr/bin/xattras homebrew can cause conflicts withxattrfs-filename: fix help conventionfs-own:--recursivewith variant spelling--rootfor setting ownership as the platform's root user and group--verboseon macosfs-temp: clarified--touchbehaviour, and support--no-touchon directoriesget-flag-value: implement--fallback-on-emptyoption used byfs-absoluteget-json-api-url.awk: fix typo in var nameget-profile: correct spelling ofpossesive-pronountopossessive-pronounget-terminal-color-support: clarified help text on return statuses in different modesget-terminal-theme: useis-integersanity check forcolorfgbgsourcegit-helper: add newumtaction to apply commit modification times to cloned git repos, used bydorothy teston CIgithub-download: fix a missing-non$pathnameexclusivity checkis-empty-value: added tests and made performantis-admin: fix multiple user handlingis-even: add tests, and only support integersis-generic: added empty string as generic, added more testsis-missing: fix incorrect help text on exit statusis-needle: added more tests, added--alland--anyoption modifiersis-odd: add tests, and only support integersmount-helper: fix two missing-nif test -n "$option_username" -o "$option_password"; thenwould have caused an error state if only password is definedif test -n "$temp" -a "$option_label"; thenchanged to justif [[ -n $temp ]]; thenas in this case, it seems better to not exist, as we always want the first line of$tempregardless of$option_label(however, then it is more a sanity procedure, but a necessary one)researchgate-rename: fix badis-samecallsetup-dns: use newfs-rmflow for removing unwanted configuration and installation files, and fix potential regression issue when removals were already removedsetup-git: fix a missingtest/[[if test "$GPG_SIGNING_AGENT" != 'op' && "$GPG_SIGNING_AGENT" != 'krypton'; thenaffectedGPG_SIGNING_AGENTwhen not using 1passwordsetup-mac-brew: don't enforce sudo for the cleanupfs-rm, asfs-rmis now intelligent enough to handle escalation itself if neededsetup-util-asciinemasetup-util-eza: usehttpsforAPT_REPOsetup-util-firefoxsetup-util-qpdfused bypdf-decryptsetup-util-tor-browsersetup-util-trash: updated for a library that actually works, and uninstall the ones that don'tsetup-util-xcode: use shapeshifter for the xcode license agreement, as it requires it as it modifies cursorwaiter: fix missing-non--stdout,--stderr, and--ttyoption handlingconfig/dns.bash: removed outdated configuration optionsconfig/styles.bash: fixed terminal resize and end styles not being found due to typodocs/errors.md: detailed the errors that dorothy actually usessources/nvm.sh: fix for edge case where nvm fails to detect systemnodedeprecated core commands:
echo-segmentreplaced byecho-style, this was done a year or more ago, before we had the deprecated directoryfs-sizereplaced byfs-structureorget-sizedepending on your use caseget-array-*andis-array-*commands replaced byecho-trim-empty-linesyes that is correct and yes it is weird, but those commands were weirdis-array-(empty|full|partial)replaced byis-whitespaceoris-not-whitespaceis-color-enabledreplaced byget-terminal-color-support --quietis-empty-lsreplaced byis-empty-directoryis-empty-stringreplaced byis-whitespaceis-nonempty-stringreplaced byis-not-whitespaceget-line-countreplaced byecho-count-linesrm-junkreplaced byfs-trim --cacherm-modulesreplaced byfs-trim --moduledeprecated beta commands:
echo-if-emptyreplaced byecho-with-whitespace-fallbackecho-if-pathreplaced byecho-if-presentis-dirreplaced byis-directoryis-eitherreplaced byis-needleis-equalreplaced byis-needleis-execreplaced byis-executableis-neitherreplaced by! is-needlerm-svnreplaced byfind ...rm-syncreplaced byfind ...promoted from beta commands:
echo-if-pathpromoted toecho-if-presentecho-last-lineecho-valuesis-empty-directoryis-evenis-filedemoted to beta commands:
echo-affirmativefind-directoriesbeta command updates:
echo-if-directoryecho-if-executableecho-truncate-lines, however you probably just wanthead -n <lines>echo-with-empty-fallback, probably needs to be renamed toecho-with-zero-length-fallbackecho-with-whitespace-fallback, renamed fromecho-if-emptyeject-all: usefs-structureeval-on-empty-stdin: rewrote for modern conventions, and supportgrepfallback for whenifneis not presenteval-on-not-empty-stdin: rewrote for modern conventionsget-codec: fix testsis-suffix: use newbash.bashhelperspdf-decrypt: rewrote for modern conventionsresearchgate-rename: useecho-regexpinstead ofpython-regex, and fixis-samecallrm-vmwarerenamed torm-vmware-fusionsetup-server: updated for newis-*fs commandsmerges: