From 84add129af8995a6ccdc9db457f89832146c16e8 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 25 Jul 2007 18:39:43 +0200 Subject: [PATCH] grml-mutt: update according to mutt hacking session in graz; add hal daemon to grml-setservices --- debian/changelog | 13 +++++++++++++ usr_bin/grml-mutt | 19 ++++++++++++------- usr_sbin/grml-setservices | 15 +++++++++++++-- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6445f5..763060c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +grml-scripts (1.0.11) unstable; urgency=low + + * grml-setservices: support HAL daemon + * grml-mutt: + - change 'set autoedit' into 'unset autoedit' + - add 'set auto_tag=yes' + - set postponed=+postponed + - add deactivated: + * set sendmail="/usr/bin/msmtp" + * set use_envelope_from + + -- Michael Prokop Wed, 25 Jul 2007 18:35:08 +0200 + grml-scripts (1.0.10) unstable; urgency=low * grml-setservices: support NFS diff --git a/usr_bin/grml-mutt b/usr_bin/grml-mutt index c09a1f9..9201054 100755 --- a/usr_bin/grml-mutt +++ b/usr_bin/grml-mutt @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Son Mär 18 17:15:41 CET 2007 [mika] +# Latest change: Mit Jul 25 18:37:29 CEST 2007 [mika] ################################################################################ PATH=${PATH:-'/bin/:/sbin/:/usr/local/bin:/usr/bin:/usr/sbin'} @@ -22,7 +22,7 @@ cat > $MUTTRC << EOF # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Son Apr 24 16:55:51 CEST 2005 [mika] +# Latest change: Mit Jul 25 18:37:29 CEST 2007 [mika] ################################################################################ # important variables - adjust them if necessary @@ -38,7 +38,8 @@ $IMAPDATA set allow_8bit # send data as it is. no conversion. unset arrow_cursor # Show current mail with an inverse bar. set ascii_chars # set: use ASCII characters to build the thread tree - set autoedit # call editor without prompting for To: and Subject: + unset autoedit # call editor without prompting for To: and Subject:? + set auto_tag=yes # the next operation applies to the tagged messages automatically unset confirmappend # set: prompt for confirmation on appending mail to folder set confirmcreate # set: prompt for confirmation on creation of folders set copy # Always keep a copy of my mails! @@ -57,6 +58,7 @@ $IMAPDATA set pager_context=1 # number of lines that overlap on paging # set pager_index_lines=0 # number of lines to see from the index set pager_stop # "next_page" won't jump to next message at end of messages + set postponed=+postponed # where save postponed messages? # set print_command="mp|lpr" # pipe message to "mp" for formattting - then on to "lpr" unset prompt_after # set: gives you a prompt when pager exits set quote_regexp="^>" # some people just use '>' - *sigh* @@ -67,6 +69,7 @@ $IMAPDATA set reverse_alias # show the name of sender as set with my alias for him set reverse_name # reply as the user to whom the mail was sent to set save_name # set: save outbound mail to =username if it exists +# set sendmail="/usr/bin/msmtp" # which sendmail program should be used? # set shell=zsh # use the zsh for shell commands set sort=threads # sorting method - I definitely like "threads" best set status_on_top # set: present the status bar at top, ie before the index @@ -76,8 +79,10 @@ $IMAPDATA set tmpdir="/tmp" # directory where temporary files are to be placed set to_chars="X+TCF" # message flags: non-personal,personal,To:,Cc:,From: set use_from # 'set from=' requires a 'set use_from'! +# set use_envelope_from # when set, mutt will use $envelope_from_address as the envelope sender set write_inc=10 # update number after each tenth read mail + # Options with a long value: # set alternates=... set attribution="* %n <%a> [%(%y%m%d %H:%M)]:" # how to cite the author @@ -323,7 +328,7 @@ ASKPOP=$(dialog --stdout --title "$PN" --yesno "Configure POP3?" 0 0) retval=$? case $retval in - 0) + 0) GETPOP3=$(dialog --stdout --title "$PN" --inputbox "Your POP3 account (pop[s]://[user]@hostname[:port]):" 0 56 "pop://") || exit 0 POP3=${GETPOP3} askpop && \ @@ -345,7 +350,7 @@ ASKIMAP=$(dialog --stdout --title "$PN" --yesno "Configure IMAP?" 0 0) retval=$? case $retval in - 0) + 0) GETIMAP=$(dialog --stdout --title "$PN" --inputbox "Your IMAP account (imap[s]://[user@]hostname[:port]/mailbox):" 0 65 "imap://") || exit 0 IMAP=${GETIMAP} askimap && \ @@ -379,12 +384,12 @@ WRITEMUTTRC=$(dialog --stdout --title "$PN" --yesno "Write $MUTTRC?" 5 65) retval=$? case $retval in - 0) + 0) if [ -f "$MUTTRC" ] ; then dialog --stdout --title "$PN" --yesno "$MUTTRC exists. Overwrite?" 5 65 retval=$? case $retval in - 0) + 0) writemuttrc && writecolors && \ dialog --stdout --title "$PN" --msgbox "Writing $MUTTRC was successful." 7 65 || \ { dialog --stdout --title "$PN" --msgbox "Error $?: writing $MUTTRC failed." 7 65 ; exit 1 ; } diff --git a/usr_sbin/grml-setservices b/usr_sbin/grml-setservices index 3da5728..a4f12eb 100755 --- a/usr_sbin/grml-setservices +++ b/usr_sbin/grml-setservices @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Mit Jul 18 02:16:12 CEST 2007 [mika] +# Latest change: Mit Jul 25 18:34:57 CEST 2007 [mika] ################################################################################ PN="$(basename $0)" @@ -45,6 +45,7 @@ or choose cancel. [ -r /etc/init.d/mdadm ] && SRAID='mdadm!software-raid via mdadm!on' [ -r /etc/init.d/dmraid ] && MRAID='dmraid!software-raid via dmraid!off' [ -r /etc/init.d/dbus -o -r /etc/init.d/dbus-1 ] && DBUS='dbus!hal/dbus (important for KDE e.g.)!off' +[ -r /etc/init.d/hal ] && HAL='hal!Hardware Abstraction Layer daemon (important for KDE e.g.)!off' [ -r /etc/init.d/nfs-common ] && NFS='nfs!Network File System (client setup)!off' ## adjust setup @@ -99,6 +100,16 @@ set_values(){ fi fi + if [ -n "$HAL" ] ; then + if is_value_set "hal" ; then + update-rc.d -f hal remove >/dev/null 2>&1 + update-rc.d hal start 24 2 3 4 5. stop 16 0 1 6 . >/dev/null 2>&1 + else + update-rc.d -f hal remove >/dev/null 2>&1 + update-rc.d hal stop 20 0 1 6 . >/dev/null 2>&1 + fi + fi + if [ -n "$NFS" ] ; then if is_value_set "nfs" ; then update-rc.d -f nfs-common remove >/dev/null 2>&1 @@ -113,7 +124,7 @@ set_values(){ # the interface itself oifs="$IFS" IFS='!' -$DIALOG --title "$PN" --checklist "$INFO" 30 65 8 $LVM $SRAID $MRAID $DBUS $NFS 2>$TMP +$DIALOG --title "$PN" --checklist "$INFO" 30 65 8 $LVM $SRAID $MRAID $DBUS $HAL $NFS 2>$TMP retval="$?" case $retval in -- 2.1.4