| @@ -13,13 +13,6 @@ mpoprc="${XDG_CONFIG_HOME:-$HOME/.config}/mpop/config" | |||||
| alias mbsync='mbsync -c "$mbsyncrc"' | alias mbsync='mbsync -c "$mbsyncrc"' | ||||
| acctseq="1 2 3 4 5 6 7 8 9" | acctseq="1 2 3 4 5 6 7 8 9" | ||||
| if [ "$(uname)" == 'OpenBSD' ]; then | |||||
| alias grep=ggrep | |||||
| alias sed=gsed | |||||
| alias awk=gawk | |||||
| fi | |||||
| for x in "/etc/ssl/certs/ca-certificates.crt" "/etc/pki/tls/certs/ca-bundle.crt" "/etc/ssl/ca-bundle.pem" "/etc/pki/tls/cacert.pem" "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" "/etc/ssl/cert.pem" "/usr/local/share/ca-certificates/"; do | for x in "/etc/ssl/certs/ca-certificates.crt" "/etc/pki/tls/certs/ca-bundle.crt" "/etc/ssl/ca-bundle.pem" "/etc/pki/tls/cacert.pem" "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" "/etc/ssl/cert.pem" "/usr/local/share/ca-certificates/"; do | ||||
| [ -f "$x" ] && sslcert="$x" && break | [ -f "$x" ] && sslcert="$x" && break | ||||
| done || { echo "CA Certificate not found. Please install one or link it to /etc/ssl/certs/ca-certificates.crt" && exit 1 ;} | done || { echo "CA Certificate not found. Please install one or link it to /etc/ssl/certs/ca-certificates.crt" && exit 1 ;} | ||||
| @@ -234,7 +227,7 @@ getboxes() { if [ -n "${force+x}" ] ; then | |||||
| mailboxes="$(echo "$info" | grep -v HasChildren | sed "s/.*\" //;s/\"//g" | tr -d ' ')" | mailboxes="$(echo "$info" | grep -v HasChildren | sed "s/.*\" //;s/\"//g" | tr -d ' ')" | ||||
| fi | fi | ||||
| [ "$type" = "pop" ] && mailboxes="INBOX" | [ "$type" = "pop" ] && mailboxes="INBOX" | ||||
| getaccounts; for x in "$acctseq"; do echo "$accounts" | grep -q "^$x:" || { export idnum="$x"; break ;}; done | |||||
| getaccounts; for x in $acctseq; do echo "$accounts" | grep -q "^$x:" || { export idnum="$x"; break ;}; done | |||||
| toappend="mailboxes $(echo "$mailboxes" | sed "s/^/\"=/;s/$/\"/" | paste -sd ' ' - )" | toappend="mailboxes $(echo "$mailboxes" | sed "s/^/\"=/;s/$/\"/" | paste -sd ' ' - )" | ||||
| for x in $mailboxes; do | for x in $mailboxes; do | ||||
| case "$x" in | case "$x" in | ||||