[gentoo-commits] proj/emacs-tools:backups/eselect-emacs@1030 commit in: /

[gentoo-commits] proj/emacs-tools:backups/eselect-emacs@1030 commit in: /

[Sebastian Pipping]

commit:     b153f2053d4c4a4d4ca4e28799e916244c519cf7
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 28 17:51:23 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 17:51:23 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=b153f205

(TMPFILE): Change TMPFILE name to updater instead of cleaner

svn path=/emacs-extra/eselect-emacs/; revision=802

---
 emacs-updater.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/emacs-updater.sh b/emacs-updater.sh
index abeb3c5..cec421d 100755
--- a/emacs-updater.sh
+++ b/emacs-updater.sh
@@ -5,7 +5,7 @@
 
 SITELISP=/usr/share/emacs/site-lisp
 VERSION=0.1
-TMPFILE=$(mktemp /tmp/emacs-cleaner.XXXXXX)
+TMPFILE=$(mktemp /tmp/emacs-updater.XXXXXX)
 
 echo "Emacs updater version ${VERSION}"
 echo "Find packages that are installed in the wrong location, file bugs on http://bugs.gentoo.org/"

[gentoo-commits] proj/emacs-tools:backups/eselect-emacs@1030 commit in: /

[Sebastian Pipping]

commit:     4d51a28b4ee194fb366cd9f241292c341035e284
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 27 13:49:57 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 13:49:57 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=4d51a28b

ChangeLog

svn path=/emacs-extra/eselect-emacs/; revision=794

---
 ChangeLog |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0bc617b..a40054f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-11-27  Christian Faulhammer  <opfer@gentoo.org>
 
+	* Makefile (DISTFILES): add update script
+
 	* emacs-updater.sh: first version of Emacs updater
 
 2007-11-20  Ulrich Mueller  <ulm@gentoo.org>

[gentoo-commits] proj/emacs-tools:backups/eselect-emacs@1030 commit in: /

[Sebastian Pipping]

commit:     7d068f35aad4034a76f3bd6019c66a2478642a4c
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 28 18:28:05 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 18:28:05 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=7d068f35

message(), warning(), failure(): Introduce new functions to display text 
define colors for console output and use them

svn path=/emacs-extra/eselect-emacs/; revision=804

---
 emacs-updater.sh |   56 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/emacs-updater.sh b/emacs-updater.sh
index cec421d..be433cd 100755
--- a/emacs-updater.sh
+++ b/emacs-updater.sh
@@ -3,52 +3,74 @@
 # Licensed under GPL version 2
 # Author Christian Faulhammer <opfer@gentoo.org>
 
+BLUE=$'\033[34;01m'
+GREEN=$'\e[32;01m'
+OFF=$'\033[0m'
+RED=$'\033[31;01m'
+YELLOW=$'\033[33;01m'
+CYAN=$'\033[36;01m'
+BOLD=$'\e[0;01m'
+NORMAL=$'\033[0m'
+
 SITELISP=/usr/share/emacs/site-lisp
 VERSION=0.1
-TMPFILE=$(mktemp /tmp/emacs-updater.XXXXXX)
+TMPFILE="$(mktemp /tmp/emacs-updater.XXXXXX)"
 
-echo "Emacs updater version ${VERSION}"
-echo "Find packages that are installed in the wrong location, file bugs on http://bugs.gentoo.org/"
-echo
-echo "Note, you must use the eclasses from the Emacs Overlay for proper operation! "
-echo
+
+message() {
+    local OUTPUT=$@
+    echo
+    echo "${GREEN}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}"
+}
+
+warning() {
+    local OUTPUT=$@
+    echo
+    echo "${YELLOW}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}"
+}
+
+failure() {
+    local OUTPUT=$@
+    echo
+    echo "${RED}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}" 
+}
+
+message "Emacs updater version ${VERSION}"
+message "Find packages that are installed in the wrong location, file bugs on http://bugs.gentoo.org/"
+warning "Note, you must use the eclasses from the Emacs Overlay for proper operation! "
 
 if ! [ -x /usr/bin/qfile ]; then
-    echo "Please emerge app-portage/portage-utils to use this tool"
+    failure "Please emerge app-portage/portage-utils to use this tool"
     exit 1
 fi
 
 for sf in "${ROOT}/${SITELISP}"/[0-9][0-9]*-gentoo.el
 do
-    echo "Processing ..."
+    message "Processing ..."
     qfile -qC "${sf}" >> "${TMPFILE}"
 done
 
 
 if [[ $(cat ${TMPFILE}) == "" ]]; then
-    echo
-    echo "No packages to update, quitting."
+    warning "No packages to update, quitting."
     exit 2
 fi
 
-echo
-echo "Packages with site files in the wrong location:"
+message "Packages with site files in the wrong location:"
 cat "${TMPFILE}"
 
 echo
-echo -n "Remerge packages? [Yes/No] "
+echo -n "${BOLD}Remerge packages?${NORMAL} [${GREEN}Yes${NORMAL}/${RED}No${NORMAL}] "
 read choice
 echo
 case "${choice}" in
      y*|Y*|"")
           ;;
      *)
-	echo "Quitting."
-	echo
+	message "Quitting."
 	exit 10 ;;
 esac
 
 emerge -av $(cat "${TMPFILE}")
 
-echo
-echo "If a package is being rebuilt over and over again, please report it on http://bugs.gentoo.org/"
+warning "If a package is being rebuilt over and over again, please report it on http://bugs.gentoo.org/"

[gentoo-commits] proj/emacs-tools:backups/eselect-emacs@1030 commit in: /

[Sebastian Pipping]

commit:     786217c3ece757047018dae9f6b29701ade8a6c8
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 28 17:51:32 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 17:51:32 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=786217c3

ChangeLog

svn path=/emacs-extra/eselect-emacs/; revision=803

---
 ChangeLog |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a40054f..1cf11e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-28  Christian Faulhammer  <opfer@gentoo.org>
+
+	* emacs-updater.sh (TMPFILE): Change TMPFILE name to updater
+	instead of cleaner
+
 2007-11-27  Christian Faulhammer  <opfer@gentoo.org>
 
 	* Makefile (DISTFILES): add update script

[gentoo-commits] proj/emacs-tools:backups/eselect-emacs@1030 commit in: /

[Sebastian Pipping]

commit:     d9cedbf504f3774ac5b39a6f1eaba3ba20266a83
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 28 18:28:28 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 18:28:28 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=d9cedbf5

ChangeLog

svn path=/emacs-extra/eselect-emacs/; revision=805

---
 ChangeLog |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1cf11e0..dab3e71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 	* emacs-updater.sh (TMPFILE): Change TMPFILE name to updater
 	instead of cleaner
+	message(), warning(), failure(): Introduce new functions to
+	display text
+	define colors for console output and use them
 
 2007-11-27  Christian Faulhammer  <opfer@gentoo.org>
 

[gentoo-commits] proj/emacs-tools:backups/eselect-emacs@1030 commit in: /

[Sebastian Pipping]

commit:     722a97410588d1cdd1361e02135bb0c1ab74901d
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 07:56:43 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 07:56:43 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=722a9741

ChangeLog

svn path=/emacs-extra/eselect-emacs/; revision=811

---
 ChangeLog |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dab3e71..25aee75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-29  Christian Faulhammer  <opfer@gentoo.org>
+
+	* emacs-updater.sh: Remove OFF "colour", because NORMAL does the
+	same and is actually used
+	Increase version number to 0.2
+	Head information reformatted with normal echo without pretty
+	output, adding author Info
+	Quit message uses warning() instead of message()
+
 2007-11-28  Christian Faulhammer  <opfer@gentoo.org>
 
 	* emacs-updater.sh (TMPFILE): Change TMPFILE name to updater

[gentoo-commits] proj/emacs-tools:backups/eselect-emacs@1030 commit in: /

[Sebastian Pipping]

commit:     4de568ec8a5a2b5f6b62b279e1ec74117d1ce981
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 30 07:06:02 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Nov 30 07:06:02 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=4de568ec

Only set colours if output is not redirected, proposed by ulm
Remove empty line display in message(), warning() and failure() for optical reasons
Format output with some more empty lines
Add URL for Emacs Project homepage to header

svn path=/emacs-extra/eselect-emacs/; revision=813

---
 emacs-updater.sh |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/emacs-updater.sh b/emacs-updater.sh
index 2c134b9..4249111 100755
--- a/emacs-updater.sh
+++ b/emacs-updater.sh
@@ -3,13 +3,16 @@
 # Licensed under GPL version 2
 # Author Christian Faulhammer <opfer@gentoo.org>
 
-BLUE=$'\033[34;01m'
-GREEN=$'\e[32;01m'
-RED=$'\033[31;01m'
-YELLOW=$'\033[33;01m'
-CYAN=$'\033[36;01m'
-BOLD=$'\e[0;01m'
-NORMAL=$'\033[0m'
+# Only set colours if output is not redirected
+if tty -s <&1; then
+    BLUE=$'\033[34;01m'
+    GREEN=$'\e[32;01m'
+    RED=$'\033[31;01m'
+    YELLOW=$'\033[33;01m'
+    CYAN=$'\033[36;01m'
+    BOLD=$'\e[0;01m'
+    NORMAL=$'\033[0m'
+fi
 
 SITELISP=/usr/share/emacs/site-lisp
 VERSION=0.2
@@ -18,29 +21,29 @@ TMPFILE="$(mktemp /tmp/emacs-updater.XXXXXX)"
 
 message() {
     local OUTPUT=$@
-    echo
     echo "${GREEN}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}"
 }
 
 warning() {
     local OUTPUT=$@
-    echo
     echo "${YELLOW}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}"
 }
 
 failure() {
     local OUTPUT=$@
-    echo
     echo "${RED}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}" 
 }
 
 echo
 echo "Emacs updater version ${VERSION}"
-echo "Written by the Gentoo Emacs team"
+echo "Written by the Gentoo Emacs team http://www.gentoo.org/proj/en/lisp/emacs/"
 echo "Find packages that are installed in the wrong location, file bugs on http://bugs.gentoo.org/"
+echo
 warning "Note, you must use the eclasses from the Emacs Overlay for proper operation! "
+echo
 
 if ! [ -x /usr/bin/qfile ]; then
+    echo
     failure "Please emerge app-portage/portage-utils to use this tool"
     exit 1
 fi
@@ -50,7 +53,7 @@ do
     message "Processing ..."
     qfile -qC "${sf}" >> "${TMPFILE}"
 done
-
+echo
 
 if [[ $(cat ${TMPFILE}) == "" ]]; then
     warning "No packages to update, quitting."

[gentoo-commits] proj/emacs-tools:backups/eselect-emacs@1030 commit in: /

[Sebastian Pipping]

commit:     52504bb036b0347a96fbcd7971e3555e8d3252e9
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  6 14:59:22 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 14:59:22 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=52504bb0

Test for existence of non-empty temp file.

svn path=/emacs-extra/eselect-emacs/; revision=834

---
 ChangeLog        |    5 +++++
 emacs-updater.sh |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5366a6..29ff43a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-06  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater.sh: Test for existence of non-empty temp file;
+	cat may fail if the file does not exist.
+
 2007-11-30  Christian Faulhammer  <opfer@gentoo.org>
 
 	* emacs-updater.sh: Only set colours if output is not redirected,

diff --git a/emacs-updater.sh b/emacs-updater.sh
index 4249111..36c314a 100755
--- a/emacs-updater.sh
+++ b/emacs-updater.sh
@@ -55,7 +55,7 @@ do
 done
 echo
 
-if [[ $(cat ${TMPFILE}) == "" ]]; then
+if [ ! -s "${TMPFILE}" ]; then
     warning "No packages to update, quitting."
     exit 2
 fi

[gentoo-commits] proj/emacs-tools:backups/eselect-emacs@1030 commit in: /

[Sebastian Pipping]

commit:     7c24304bb085be00b97c629386ce0e9780d660ff
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 12 08:15:07 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Dec 12 08:15:07 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=7c24304b

Ignore auxiliary file 00site-gentoo.el

svn path=/emacs-extra/eselect-emacs/; revision=846

---
 ChangeLog        |    1 +
 emacs-updater.sh |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7467d12..2a9ea68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	* emacs-updater.sh: Make "Processing" message more informative.
 	Don't ask users to report all rebuilt packages as bugs.
 	Break some long lines.
+	Ignore auxiliary file 00site-gentoo.el.
 
 2007-12-06  Ulrich Mueller  <ulm@gentoo.org>
 

diff --git a/emacs-updater.sh b/emacs-updater.sh
index a93471a..3d3c26f 100755
--- a/emacs-updater.sh
+++ b/emacs-updater.sh
@@ -54,6 +54,7 @@ fi
 
 for sf in "${ROOT}/${SITELISP}"/[0-9][0-9]*-gentoo.el
 do
+    [ "${sf##*/}" = 00site-gentoo.el ] && continue
     message "Processing ${sf##*/} ..."
     qfile -qC "${sf}" >> "${TMPFILE}"
 done

[gentoo-commits] proj/emacs-tools:backups/eselect-emacs@1030 commit in: /

[Sebastian Pipping]

commit:     9ad2576f16cb6c98d6947e51c7a36a831bdbba00
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 12 08:24:37 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Dec 12 08:24:37 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=9ad2576f

Handle ROOT in qfile command

svn path=/emacs-extra/eselect-emacs/; revision=847

---
 emacs-updater.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emacs-updater.sh b/emacs-updater.sh
index 3d3c26f..590c1be 100755
--- a/emacs-updater.sh
+++ b/emacs-updater.sh
@@ -52,11 +52,11 @@ if ! [ -x /usr/bin/qfile ]; then
     exit 1
 fi
 
-for sf in "${ROOT}/${SITELISP}"/[0-9][0-9]*-gentoo.el
+for sf in "${ROOT}${SITELISP}"/[0-9][0-9]*-gentoo.el
 do
     [ "${sf##*/}" = 00site-gentoo.el ] && continue
     message "Processing ${sf##*/} ..."
-    qfile -qC "${sf}" >> "${TMPFILE}"
+    qfile -qCR "${sf}" >> "${TMPFILE}"
 done
 echo
 

[gentoo-commits] proj/emacs-tools:backups/eselect-emacs@1030 commit in: /

[Sebastian Pipping]

commit:     667ff60bc9872c312914d6dffb4707df8f6c9e2e
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 17 08:24:09 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Dec 17 08:24:09 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=667ff60b

add documentation for do_updpkg() and correct a type

svn path=/emacs-extra/eselect-emacs/; revision=871

---
 ChangeLog       |    2 ++
 emacs.eselect.5 |   12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 09b760e..b6e6cbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-12-17  Christian Faulhammer  <opfer@gentoo.org>
 
+	* emacs.eselect.5: add documentation for do_updpkg() and correct a type
+
 	* emacs.eselect: add do_updpkg(), which calls emacs-updater
 
 2007-11-20  Ulrich Mueller  <ulm@gentoo.org>

diff --git a/emacs.eselect.5 b/emacs.eselect.5
index 98d897f..3c4b764 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -15,6 +15,8 @@ emacs.eselect \- The Emacs management module for Gentoo's eselect
 \fBeselect emacs show\fR
 .br
 \fBeselect emacs update\fR [\fIifunset\fR]
+.br
+\fBeselect emacs updpkg\fR
 .SH "DESCRIPTION"
 \fBeselect\fR is Gentoo's configuration and management tool. It features
 modules that care for the individual administrative tasks.
@@ -65,7 +67,15 @@ overridden.
 Switching to emacs-22 ...
 .br
 Switching to ctags-emacs-22 ...
-.SH "AUTHOR"
+
+.SH "ACTION: UPDPKG"
+\fBeselect emacs updpkg\fR
+.br
+The location for site initialisation files from the app-emacs category (and packages
+with optional Emacs support) has changed.  The old location is still
+supported but a painful migration will be made with the help of
+emacs-updater.  This action calls it.
+.SH "AUTHORS"
 Christian Faulhammer <opfer@gentoo.org>
 .br
 Ulrich Mueller <ulm@gentoo.org>