dot

packages and services management
Log | Files | Refs | README

commit 650bea3948911f07b3560f7a31bd1a2c0907bcad
parent 1e1ae651262c4d296bfb2003c6f5d8d5f9dbd0b8
Author: josuah <mail@josuah.net>
Date:   Sat, 19 Nov 2016 18:26:41 +0100

Fixed buffer and small updates

Diffstat:
M.mailrc | 14+++++++-------
Mbin/buffer | 13+++++++++----
Mbin/build | 5++---
Mbin/config | 10+++++-----
Mbin/status | 1-
Mbuild/iomenu | 2+-
Mbuild/s-mailx | 8+++-----
7 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/.mailrc b/.mailrc @@ -1,7 +1,7 @@ # * | # --.-. ,--. , | .,-- ,--. # | | | ,--| | | | | -# ' ' ' `--` ' ' ' `--' 2016-10-08 +# ' ' ' `--` ' ' ' `--' 2016-11-19 #------------------------------------------------------------------------------- # s-nail configuration file @@ -12,7 +12,7 @@ set hold set keepsave -# DISPLAY 2016-09-26 +# Display #------------------------------------------------------------------------------- # Do not send output to pager under this number of line, and also add colours if @@ -28,7 +28,7 @@ set datefield="%R %m-%d" datefield-markout-older=" %g-%m-%d" #set prompt="\033[1m\?\$ \@>\033[0m " -# COMPOSING +# Composing #------------------------------------------------------------------------------- # Automatically quote the text of the message that is responded to. @@ -51,7 +51,7 @@ set ask set editalong -# HEADLINE +# Headline #------------------------------------------------------------------------------- set headline="%>%a %m %-f %11d %i%-s" @@ -90,7 +90,7 @@ set showname set showto -# COMMANDS +# Commands #------------------------------------------------------------------------------- # Only include these selected header fields when forwarding messages @@ -100,7 +100,7 @@ fwdretain subject date from to retain date from to cc subject message-id mail-followup-to reply-to -# ATTACHMENTS +# Attachments #------------------------------------------------------------------------------- # HTML as text, inline display via w3m @@ -115,7 +115,7 @@ set pipe-application/html="tee > \ # s-it-mode -# MACROS 2016-09-18 +# Macros #------------------------------------------------------------------------------- # If threaded mode is activated, automatically collapse thread diff --git a/bin/buffer b/bin/buffer @@ -71,7 +71,6 @@ get_options() tee -a "$CACHE/buffer/history" sort -u "$CACHE/buffer/history" -o "$CACHE/buffer/history" - # printf %s "$history" > "$CACHE/buffer/history" } @@ -112,7 +111,7 @@ EOF [ -z "$command" ] && exit 1 - # if there is not already arguments in the command, prompt for them + # prompt for option if needed if [ "${command##* *}" ] then [ -z "$options" ] && options="$( get_options "$command")" @@ -127,9 +126,15 @@ EOF name="$command${options:+ $options}${path:+ ~${path#$HOME}}" name="$(printf %s "$name" | tr / !)" + export TERM='screen' ABDUCO="$command" + # run new or existing session with this name - TERM='screen' ABDUCO="$command" exec abduco -e ^Z -A "$name" \ - $command $options "$path" + if [ "$path" ] + then + exec abduco -e ^Z -A "$name" $command $options "$path" + else + exec abduco -e ^Z -A "$name" $command $options + fi } diff --git a/bin/build b/bin/build @@ -62,9 +62,8 @@ build() [ -f ./autogen.sh ] && ./autogen.sh [ -f ./configure ] && ./configure --prefix="$PREFIX" - make - make prefix="$PREFIX" PREFIX="$PREFIX" install clean - return 0 + make && make prefix="$PREFIX" PREFIX="$PREFIX" install clean + return $? } diff --git a/bin/config b/bin/config @@ -1,7 +1,5 @@ CONFIG="$(cd "${0%/*/*}"; pwd)" -printf '%s\n' "$CONFIG" - usage() { @@ -57,12 +55,14 @@ git_repos() netrc() { - read -p 'address: ' - read -p 'host: ' + mkdir -p "$MAIL/cur" "$MAIL/new" "$MAIL/tmp" + + read -p 'address: ' address + read -p 'host: ' host read -p 'password: ' password printf 'machine %s\nlogin %s\npassword "%s"' \ - "$MAIL_HOST" "$MAIL_ADDR" "$password" > ~/.netrc + "$host" "$address" "$password" > ~/.netrc chmod 400 "$HOME/.netrc" printf '\033[A\r\033[K' diff --git a/bin/status b/bin/status @@ -1,4 +1,3 @@ -#!/bin/sh # | | # ,--- |-- ,--. |-- , , ,--- # `--. | ,--| | | | `--. diff --git a/build/iomenu b/build/iomenu @@ -1,3 +1,3 @@ # Input/Output interactive menu and completion engine. -tar=http://repo.or.cz/iomenu.git/snapshot/28815096e34172ebe85a1c5f45adcc4c40c72c6c.tar.gz +tar=http://repo.or.cz/iomenu.git/snapshot/4138689c19cde5ed0224266edd1804b73cd0b025.tar.gz diff --git a/build/s-mailx b/build/s-mailx @@ -1,9 +1,8 @@ -# Clean MailX implementation +# Improved MailX implementation tar=http://www.sdaoden.eu/downloads/s-nail-latest.tar.gz build() { - make config - make PREFIX="$PREFIX" install -}- \ No newline at end of file + make CONFIG=MAXIMAL PREFIX="$PREFIX" config install +}