Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

better way to enable/disable ANSI escape codes in messages #332

Open
wants to merge 34 commits into
base: master
Choose a base branch
from

Conversation

natmaka
Copy link
Contributor

@natmaka natmaka commented Jul 5, 2022

  • better logcheck rules
  • minor fixes/enhancements to the documentation

@graysky2
Copy link
Owner

graysky2 commented Jan 1, 2023

Can you squash into a single commit please

@natmaka
Copy link
Contributor Author

natmaka commented Jan 1, 2023

I don't know how to squash (I tried, it fails, and I have no interest in exploring git), sorry

@graysky2
Copy link
Owner

graysky2 commented Jan 1, 2023

git rebase -i HEAD~18

Leave the first line as-is
change the word pick to f for the remaining 17 lines

ranisalt and others added 8 commits January 2, 2023 13:38
This is required to share the synced profiles with flatpak executables. $XDG_RUNTIME_DIR can't be shared, but specified directories inside it can, allowing flatpak-ed browsers to use psd.

Keeps $PID_FILE in the same location for compatibility purposes.
This trailing slash prevents `psd` to form a proper dir-name for backup/overlay, so `psd` does not work properly with `surf`, issuing the message:
`stat: cannot statx '~/.surf/-backup': No such file or directory`.
`surf` keeps its config in "~/.surf". Before this fix, the resulting backup dir is "~/.surf/-backup", not "~/.surf-backup" as it should be.
This means that `psd` tries to create a backup inside the dir which it supposed to make backup of. :)
After removing this unfortunate '/', `psd` works with `surf` correctly, making proper dirs: '~/.surf-backup' and '~/.surf-back-ovfs'.
| sync target:  /home/elf/.surf
| tmpfs dir:    /run/user/1000/elf-surf

Note, that none of other browser's configs (in "/usr/share/psd/browsers/*") contains such trailing '/'.

Thanks for you work on this Daemon! : )
@natmaka
Copy link
Contributor Author

natmaka commented Jan 6, 2023

I 'squashed' as required, is it OK?

@graysky2
Copy link
Owner

graysky2 commented Jan 6, 2023

There are still 34 commits in your PR: git push origin +$(git rev-parse --abbrev-ref HEAD)

@natmaka
Copy link
Contributor Author

natmaka commented Jan 7, 2023

It failed again:

$ git push origin +$(git rev-parse --abbrev-ref HEAD)
Everything up-to-date
$ git push
Everything up-to-date

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.

5 participants