瀏覽代碼

drop XDG_DATA_HOME: just $MAILDIR defaulting to $HOME/mail (mail is user data, not app data)

pull/276/head
Roland Puntaier 6 年之前
父節點
當前提交
1ecd6be1a3
共有 4 個檔案被更改,包括 4 行新增6 行删除
  1. +1
    -1
      README.md
  2. +1
    -1
      bin/mailsync
  3. +1
    -1
      bin/mw
  4. +1
    -3
      mw.1

+ 1
- 1
README.md 查看文件

@@ -96,7 +96,7 @@ To give you an example of the interface, here's an idea:


## New stuff and improvements since the original release ## New stuff and improvements since the original release


- honors `$MAILDIR`, `$XDG_CONFIG_HOME`, `$XDG_DATA_HOME`, `$XDG_CACHE_HOME`, if defined.
- honors `$MAILDIR`, `$XDG_CONFIG_HOME`, `$XDG_CACHE_HOME`, if defined.
- `gm/gM` to sync mail inside `mutt`, as `o/O` has a `mutt` assignment already. - `gm/gM` to sync mail inside `mutt`, as `o/O` has a `mutt` assignment already.
- Make channel name equal to email address to avoid choosing a new name for the same thing. - Make channel name equal to email address to avoid choosing a new name for the same thing.
- `isync`/`mbsync` has replaced `offlineimap` as the backend. - `isync`/`mbsync` has replaced `offlineimap` as the backend.


+ 1
- 1
bin/mailsync 查看文件

@@ -13,7 +13,7 @@ if [[ -z $PASSWORD_STORE_DIR ]]; then
[ -d "$HOME/.local/share/password-store" ] && export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" [ -d "$HOME/.local/share/password-store" ] && export PASSWORD_STORE_DIR="$HOME/.local/share/password-store"
fi fi
configdir=${XDG_CONFIG_HOME:-$HOME/.config} configdir=${XDG_CONFIG_HOME:-$HOME/.config}
maildir="${MAILDIR:-${XDG_DATA_HOME:-$HOME/.local/share}/mail}"
maildir="${MAILDIR:-$HOME/mail}"
lastrun=${XDG_CACHE_HOME:-$HOME/.cache}/.mailsynclastrun lastrun=${XDG_CACHE_HOME:-$HOME/.cache}/.mailsynclastrun
if [[ -f $configdir/isync/mbsyncrc ]]; then if [[ -f $configdir/isync/mbsyncrc ]]; then
mbsyncrc="$configdir/isync/mbsyncrc" mbsyncrc="$configdir/isync/mbsyncrc"


+ 1
- 1
bin/mw 查看文件

@@ -29,7 +29,7 @@ mwmuttdir="$mwconfigdir/mutt"
# Directory for account settings # Directory for account settings
mwaccrcdir="$mwmuttdir/accounts" mwaccrcdir="$mwmuttdir/accounts"
# Location of mail storage # Location of mail storage
mwmaildir="${MAILDIR:-${XDG_DATA_HOME:-$HOME/.local/share}/mail}"
mwmaildir="${MAILDIR:-$HOME/mail}"
# Regex to confirm valid email address # Regex to confirm valid email address
mwemailre=".\+@.\+\\..\+" mwemailre=".\+@.\+\\..\+"
mwshare="$prefix/share/mutt-wizard" mwshare="$prefix/share/mutt-wizard"


+ 1
- 3
mw.1 查看文件

@@ -40,9 +40,7 @@ If the user chooses to keep offline email with
it will be kept in it will be kept in
.I $MAILDIR .I $MAILDIR
which defaults to which defaults to
.I $XDG_DATA_HOME/share/mail/
which defaults to
.I ~/.local/share/mail/.
.I $HOME/mail/.
.B notmuch .B notmuch
can be used to index and search this mail by giving this directory when first running can be used to index and search this mail by giving this directory when first running
.B notmuch setup. .B notmuch setup.


Loading…
取消
儲存