public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

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



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     3efb64acc6a4620f3e99b42ae4b23955284bc6cc
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 21:49:47 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 21:49:47 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=3efb64ac

Use \e consistently.

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

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

diff --git a/emacs-updater.sh b/emacs-updater.sh
index 36c314a..392ebae 100755
--- a/emacs-updater.sh
+++ b/emacs-updater.sh
@@ -5,13 +5,13 @@
 
 # Only set colours if output is not redirected
 if tty -s <&1; then
-    BLUE=$'\033[34;01m'
+    BLUE=$'\e[34;01m'
     GREEN=$'\e[32;01m'
-    RED=$'\033[31;01m'
-    YELLOW=$'\033[33;01m'
-    CYAN=$'\033[36;01m'
+    RED=$'\e[31;01m'
+    YELLOW=$'\e[33;01m'
+    CYAN=$'\e[36;01m'
     BOLD=$'\e[0;01m'
-    NORMAL=$'\033[0m'
+    NORMAL=$'\e[0m'
 fi
 
 SITELISP=/usr/share/emacs/site-lisp



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

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



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     783f2b373ccf6ef5f856411b5408b9f1217bcf6c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 11:27:02 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 11:27:02 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=783f2b37

Move emacs-updater into own directory and split the ChangeLog.

svn path=/emacs-extra/emacs-updater/; revision=855

---
 ChangeLog       |  272 -------------------------------------------------------
 Makefile        |   23 -----
 ctags.eselect   |  217 --------------------------------------------
 ctags.eselect.5 |   71 --------------
 emacs.eselect   |  266 -----------------------------------------------------
 emacs.eselect.5 |   76 ---------------
 6 files changed, 0 insertions(+), 925 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 534835d..6cc855e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,276 +42,4 @@
 
 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>
-
-	* version 1.3
-
-2007-10-08  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs.eselect (do_show, do_list): Previous change commented out.
-
-2007-10-08  Christian Faulhammer  <opfer@gentoo.org>
-
-	* emacs.eselect: Warn people that their system is infected by Vi
-
-2007-08-24  Ulrich Mueller  <ulm@gentoo.org>
-
-	* ctags.eselect.5: Ditto.
-
-	* emacs.eselect.5: Action "show" has no parameters.
-
-2007-08-22  Ulrich Mueller  <ulm@gentoo.org>
-
-	* version 1.2
-
-	* ctags.eselect.5: Update man page.
-
-	* ctags.eselect (do_set, do_update): Handle the FreeBSD case where
-	/usr/bin/ctags is a real file.
-
-2007-08-19  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs.eselect.5: Update man page accordingly.
-
-	* emacs.eselect (do_update, describe_update_options): Rename
-	parameter to "ifunset"; accept "--if-unset" for backwards
-	compatibility. (According to the eselect team, hyphens should not
-	be used.)
-
-2007-07-09  Ulrich Mueller  <ulm@gentoo.org>
-
-	* ctags.eselect.5: Ditto.
-
-	* emacs.eselect.5: Canonical order, section "SEE ALSO" last.
-
-2007-06-29  Ulrich Mueller  <ulm@gentoo.org>
-
-	* version 1.1
-
-2007-06-22  Ulrich Mueller  <ulm@gentoo.org>
-
-	* Makefile (DISTFILES): Add ctags.eselect and ctags.eselect.5.
-
-	* emacs.eselect (do_set, do_update): Call ctags module.
-	(BINARYLIST, MANPAGELIST): Remove ctags from lists.
-
-	* ctags.eselect.5: New file, man page.
-
-	* ctags.eselect: New file, eselect module for ctags, bug #29398.
-
-	* emacs.eselect (do_show, do_list, do_set, do_update): Test for
-	number of parameters. Quote variables correctly.
-
-2007-06-17  Ulrich Mueller  <ulm@gentoo.org>
-
-	* version 1.0
-
-	* emacs.eselect (set_symlinks): Call env.eselect module;
-	it supports the "noldconfig" option since eselect version 1.0.10.
-
-	* env-emacs.eselect: Remove file.
-
-	* Makefile (DISTFILES): Undo previous change.
-
-2007-06-10  Ulrich Mueller  <ulm@gentoo.org>
-
-	* env-emacs.eselect: New file, taken from env.eselect of
-	eselect-1.0.9, extended to support the --no-ldconfig option.
-
-	* Makefile (DISTFILES): env-emacs.eselect added.
-
-2007-06-05  Christian Faulhammer  <opfer@gentoo.org>
-
-	* added an additional die for remove_symlinks() in set_symlinks()
-
-	* rephrased output in do_set() and do_update()
-
-	* rewrote parts do_set() in such a way that an invalid target does
-	not cause an undefined state.  An invalid target was checked after
-	the symlinks were deleted and then not setting a new target
-
-2007-05-29  Christian Faulhammer  <opfer@gentoo.org>
-
-	* Changed description of do_update()
-
-	* Added a comment to Makefile
-
-	* Took a check for modification right from do_update() to own
-	function and use them in do_set(), too
-
-	* Made a ndash out of a divis
-
-	* Added quotes around use of ROOT variable in remove_infopath(),
-	set_man_symlinks(), set_infopath(), find_targets(), do_list()
-
-	* Commented functions remove_infopath()
-
-	* Moved the comment for find_targets(), set_infopath(),
-	remove_symlinks(), set_bin_symlinks(), set_man_symlinks(),
-	set_symlinks()
-
-	* Brief overview of functions completed in the header of the module
-
-	* Change wording: implementation -> version
-
-2007-05-24  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs.eselect (xemacs_info): Use write_list_start function.
-	Honour ${ROOT}.
-
-	* Makefile (PV): Extract version from new ChangeLog format.
-
-2007-05-24  Christian Faulhammer  <opfer@gentoo.org>
-
-	* XEmacs detection into own function, which is called by do_list
-	and do_show
-
-	* version 0.9
-
-	* Give a message for list command if XEmacs is found (request by
-	Hans de Graaff)
-
-	* added a note about that behaviour in man page
-
-	* added version number in comment of eselect module
-
-	* added a comment about the highlighted star, that indicates the
-	currently chosen version with do_list
-
-2007-04-16  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs.eselect.5: Updated e-mail address in man page.
-
-2007-04-04  Ulrich Mueller  <ulm@gentoo.org>
-
-	* version 0.8
-
-2007-04-01  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs.eselect (set_symlinks): Check for range of array and
-	display error message.
-
-2007-03-29  Ulrich Mueller  <ulm@gentoo.org>
-
-	* Desktop entries and icons moved to emacs-desktop.
-
-	* emacs.eselect.5: Fixed typo and capitalised "Emacs" where
-	appropriate. Added copyright notice.
-
-	* SVN keywords activated.
-
-	* version 0.7
-
-2007-03-28  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs.eselect.5: Added man page.
-
-	* emacs.eselect (do_set, do_update): Undo previous change.
-
-	* version 0.6
-
-2007-03-27  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs.eselect (set_symlinks): env.eselect seems to be buggy; use
-	env-update instead.
-	(do_set, do_update): Brought more in line. Check for root.
-	Redundant remove_symlinks removed.
-
-	* emacs.eselect (set_symlinks): Call env.eselect to update the
-	environment from env.d files.
-
-2007-03-24  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacsclient.desktop (Exec): Removed -n option.
-
-	* version 0.5
-
-2007-03-23  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacsclient.desktop: New file.
-
-	* emacs.desktop (MimeType, TryExec): Add keys.
-
-2007-03-22  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs.eselect: Added some comments.
-
-	* version 0.4
-
-	* emacs.eselect (set_man_symlinks): Handling of compression
-	extensions made more robust.
-
-2007-03-21  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs_*.png, gnured_48.png: Added two alternative icons (not
-	used yet): emacs_48.png is from etc/images/icons of the	Emacs
-	sources, gnured_48.png is based on an image taken from
-	http://www.ee.ryerson.ca/~elf/emacs/logo/ and scaled down.
-
-	* emacs.desktop (Type): Set Type=Application only
-
-	* emacs.eselect (set_symlinks, set_bin_symlinks)
-	(set_man_symlinks): Make linking to XEmacs auxiliary programs
-	really work. Some cleanup.
-
-2007-03-19  Christian Faulhammer  <opfer@gentoo.org>
-
-	* version 0.3
-
-2007-03-19  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs.eselect (set_infopath): Test if Info directory exists.
-	(find_targets, set_symlinks): Use emacs-${SLOT} instead of
-	emacs-emacs-${SLOT} as symlink target.
-
-2007-03-18  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs.eselect (set_bin_symlinks, set_symlinks, do_update):
-	If Emacs was not found, link {c,e}tags to XEmacs versions.
-	(set_man_symlinks, set_symlinks, do_show, do_list): Suffix changed
-	from ".emacs-${SLOT}" to "-emacs-${SLOT}".
-	(remove_symlinks): Removal of man page symlinks simplified.
-
-	* version 0.2
-
-2007-03-17  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs.eselect (do_update): Update to the newest available
-	version.
-	(remove_infopath): New function.
-	(remove_symlinks): Cleanup env.d file in do_update().
-
-2007-03-16  Ulrich Mueller  <ulm@gentoo.org>
-
-	* emacs.eselect (remove_symlinks, set_man_symlinks): Remove man
-	symlinks with all possible compress extensions. Honour ${ROOT} in
-	set_man_symlinks. Don't test for -z ${extension} since the empty
-	string is a legal value (meaning no compression).
-	(do_set, do_update): We don't have "providers" but versions.
-	(remove_symlinks, set_symlinks): Create symlinks for existing
-	binaries only. Added gfdl to MANPAGELIST. Use MANPAGELIST instead
-	of BINARYLIST for manpage removal.
-
-2007-03-15  Christian Faulhammer  <opfer@gentoo.org>
-
-	* version 0.1
-
-	* based on Vi's eselect module
-
-	* has actions:
-		show: currently used implementation
-		set: set a specific version to be symlinked from
-		/usr/bin/emacs
-		update: set the highest version automatically
-		list: list available implementations
-
-	* automatically symlink all needed executables
-
-	* automatically symlink man pages
-
-	* automatically set correct INFOPATH
-

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7497b08..0000000
--- a/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Makefile creates the tarball to be uploaded to the Gentoo mirrors
-#
-
-PN = eselect-emacs
-#PV = $(shell sed '/^Version/h;$$!d;g;s/[^0-9.]*\([0-9.]*\).*/\1/' ChangeLog)
-PV = $(shell sed '/^[ \t]*\* .*[Vv]ersion/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' \
-	ChangeLog)
-P = $(PN)-$(PV)
-
-DISTFILES = emacs.eselect ctags.eselect \
-	emacs.eselect.5 ctags.eselect.5 ChangeLog emacs-updater.sh
-
-
-.PHONY: all dist clean
-
-all:
-
-dist: $(DISTFILES)
-	tar -cjf $(P).tar.bz2 --transform='s%^%$(P)/%' $^
-	tar -tjvf $(P).tar.bz2
-
-clean:
-	-rm -f *~ *.tmp *.gz *.bz2

diff --git a/ctags.eselect b/ctags.eselect
deleted file mode 100644
index 8b82554..0000000
--- a/ctags.eselect
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-#
-# DOCUMENTATION
-# Following actions possible
-# * show		do_show()
-# * list		do_list()
-# * set			do_set()
-# * update		do_update()
-#
-# Behaviour:
-# do_show():
-#	Checks if /usr/bin/ctags is a link and if the target exists,
-#	if yes, it outputs the currently linked ctags implementation.
-#	If it is no symlink, the user is told so, the same if there is
-#	no /usr/bin/ctags or the target does not exist.
-# do_list(): List all available ctags implementations.
-# do_set(): Set a version to be target of the symlink.
-# do_update(): Set the target to the "best" available version. See below.
-
-DESCRIPTION="Manage /usr/bin/ctags implementations"
-MAINTAINER="emacs@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-find_targets() {
-	# Return the list of available ctags implementations
-
-	# (X)Emacs: offer only one ctags implementation, namely for the
-	# currently active Emacs version (selected by emacs.eselect)
-	# The logic here is the same as in emacs.eselect, don't change it!
-	local emacs
-	if [[ -L "${ROOT}/usr/bin/emacs" && \
-		  -e $(canonicalise "${ROOT}/usr/bin/emacs") ]]; then
-		emacs=$(basename $(canonicalise "${ROOT}/usr/bin/emacs") )
-		[[ -f "${ROOT}/usr/bin/ctags-${emacs}" ]] && echo "ctags-${emacs}"
-	elif [[ -f "${ROOT}/usr/bin/xemacs" ]]; then
-		[[ -f "${ROOT}/usr/bin/ctags-xemacs" ]] && echo ctags-xemacs
-	fi
-
-	# Exuberant ctags
-	[[ -f "${ROOT}"/usr/bin/exuberant-ctags ]] && echo exuberant-ctags
-}
-
-remove_symlinks() {
-	# Remove existing symlinks to binary and man page
-	rm -f "${ROOT}"/usr/bin/ctags
-	rm -f "${ROOT}"/usr/share/man/man1/ctags.1*
-}
-
-set_bin_symlinks() {
-	# Set symlink to binary
-	local target=${1}
-	ln -s "${target}" "${ROOT}/usr/bin/ctags" \
-		|| die "Couldn't set ${target} ${ROOT}/usr/bin/ctags symlink"
-}
-
-set_man_symlinks() {
-	# Set symlink to man page
-	local target=${1} extension i
-	for i in "${ROOT}"/usr/share/man/man1/${target}.1*; do
-		if [[ -f ${i} ]]; then
-			# target file exists; determine compress extension
-			extension=${i##*/${target}.1}
-			ln -s "${target}.1${extension}" \
-				"${ROOT}/usr/share/man/man1/ctags.1${extension}"
-		fi
-	done
-}
-
-set_symlinks() {
-	# Set symlinks to binary and man page
-	local target="${1}" targets
-	# target may be specified by its name or its index
-	if is_number "${target}"; then
-		# numeric index, find the target's name
-		targets=( $(find_targets) )
-		[[ ${target} -ge 1 && ${target} -le ${#targets[@]} ]] \
-			|| die -q "Number out of range: ${1}"
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-
-	# is the target valid, i.e. does a ctags binary with this name exist?
-	[[ -f "${ROOT}/usr/bin/${target}" ]] \
-		|| die -q "Target \"${1}\" doesn't appear to be valid!"
-
-	echo "Switching to ${target} ..."
-	remove_symlinks || die -q "Couldn't remove existing symlink"
-	set_bin_symlinks "${target}"
-	set_man_symlinks "${target}"
-	return 0
-}
-
-test_for_root() {
-	# checks if the user has rights to modify /usr/bin/
-	[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current target of the ctags symlink"
-}
-
-do_show() {
-	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
-
-	write_list_start "Current target of ctags symlink:"
-	if [[ -L "${ROOT}/usr/bin/ctags" && \
-		  -e $(canonicalise "${ROOT}/usr/bin/ctags") ]]; then
-		write_kv_list_entry \
-			$(basename $(canonicalise "${ROOT}/usr/bin/ctags") ) ""
-	elif [[ -e "${ROOT}/usr/bin/ctags" ]]; then
-		write_kv_list_entry \
-			"(not a symlink or target of symlink does not exist)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available ctags symlink targets"
-}
-
-do_list() {
-	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
-
-	local i targets
-	targets=( $(find_targets) )
-
-	if [[ -n ${targets[@]} ]]; then
-		for (( i = 0; i < ${#targets[@]}; i = i + 1 )); do
-			# Display a star to indicate the currently chosen version
-			[[ ${targets[${i}]} = \
-				$(basename $(canonicalise "${ROOT}/usr/bin/ctags") ) ]] \
-				&& targets[${i}]="${targets[${i}]} $(highlight '*')"
-		done
-		write_list_start "Available ctags symlink targets:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new ctags symlink"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	[[ -z "${1}" ]] && die -q "You didn't tell me what to set the symlink to"
-	[[ ${#@} -gt 1 ]] && die -q "Too many parameters"
-	test_for_root
-
-	if [[ -e "${ROOT}/usr/bin/ctags" && ! -L "${ROOT}/usr/bin/ctags" ]]; then
-		if [[ -f "${ROOT}/usr/bin/ctags" && $(uname) == FreeBSD ]]; then
-			# On FreeBSD ctags is a real file, installed by freebsd-ubin
-			echo "${ROOT}/usr/bin/ctags is a real file - no action"
-			return
-		fi
-		die -q "Sorry, ${ROOT}/usr/bin/ctags exists but is not a symlink"
-	fi
-
-	set_symlinks "${1}" || die -q "Couldn't set a new symlink"
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the ctags symlink"
-}
-
-do_update() {
-	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
-	test_for_root
-
-	local ctags=""
-	if [[ -L "${ROOT}/usr/bin/ctags" ]]; then
-		ctags=$(basename $(canonicalise "${ROOT}/usr/bin/ctags") )
-		if [[ ! -e $(canonicalise "${ROOT}/usr/bin/ctags") ]]; then
-			# clean up dead symlinks
-			remove_symlinks || die -q "Couldn't remove existing symlink"
-		fi
-	elif [[ -e "${ROOT}/usr/bin/ctags" ]]; then
-		if [[ -f "${ROOT}/usr/bin/ctags" && $(uname) == FreeBSD ]]; then
-			# On FreeBSD ctags is a real file, installed by freebsd-ubin
-			return
-		fi
-		die -q "Sorry, ${ROOT}/usr/bin/ctags exists but is not a symlink"
-	fi
-
-	# For an "update" only the version should be changed, but not the
-	# provider (i.e. Emacs vs Exuberant). At the moment only (X)Emacs
-	# offers several concurrent versions.
-
-	local i target targets=( $(find_targets) )
-	if [[ ${#targets[@]} -gt 0 ]]; then
-		target=${targets[0]}
-		[[ "${ctags}" == ctags-*emacs* ]] && ctags="ctags-*emacs*"
-		for i in ${targets[@]}; do
-			[[ "${i}" == "${ctags}" ]] && target="${i}"
-		done
-		set_symlinks "${target}" || die -q "Couldn't set a new symlink"
-	fi
-}

diff --git a/ctags.eselect.5 b/ctags.eselect.5
deleted file mode 100644
index f0972d3..0000000
--- a/ctags.eselect.5
+++ /dev/null
@@ -1,71 +0,0 @@
-.\" Copyright 1999-2007 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
-.\" $Id$
-.\"
-.TH "ESELECT" "5" "August 2007" "Gentoo Linux" "eselect"
-.SH "NAME"
-ctags.eselect \- The ctags management module for Gentoo's eselect
-.SH "SYNOPSIS"
-\fBeselect ctags\fR [\fBhelp\fR|\fBusage\fR]
-.br
-\fBeselect ctags list\fR
-.br
-\fBeselect ctags set\fR \fItarget\fR
-.br
-\fBeselect ctags show\fR
-.br
-\fBeselect ctags update\fR
-.SH "DESCRIPTION"
-\fBeselect\fR is Gentoo's configuration and management tool. It features
-modules that care for the individual administrative tasks.
-.SH "ACTION: LIST"
-\fBeselect ctags list\fR
-.br
-List all installed ctags versions.
-
-# eselect ctags list
-.br
-Available ctags symlink targets:
-.br
-  [1]   ctags-emacs-22 *
-  [2]   exuberant-ctags
-.SH "ACTION: SET"
-\fBeselect ctags set\fR \fItarget\fR
-.br
-Activates the selected ctags version. \fItarget\fR can be either an
-identification number given by \fBeselect ctags list\fR or the name of
-one installed version.
-
-# eselect ctags set 2
-.br
-Switching to exuberant-ctags ...
-.SH "ACTION: SHOW"
-\fBeselect ctags show\fR
-.br
-Prints the currently activated ctags version.
-
-# eselect ctags show
-.br
-Current target of symlink:
-.br
-  exuberant-ctags
-.SH "ACTION: UPDATE"
-\fBeselect ctags update\fR
-.br
-Update the ctags symlink. For an update only the version is changed,
-but not the provider (i.e. Emacs vs Exuberant). At the moment only
-(X)Emacs offers several concurrent versions.
-
-# eselect ctags update
-.br
-Switching to exuberant-ctags ...
-.SH "BUGS"
-Under FreeBSD, \fBeselect ctags\fR does not work since \fBctags\fR is
-a real binary (owned by package freebsd-ubin).
-.SH "AUTHOR"
-Ulrich Mueller <ulm@gentoo.org>
-.SH "SEE ALSO"
-.BR eselect (1),
-.BR emacs.eselect (5)
-.SH "REVISION"
-$Id$

diff --git a/emacs.eselect b/emacs.eselect
deleted file mode 100644
index 96d4aff..0000000
--- a/emacs.eselect
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-#
-# DOCUMENTATION
-# Following actions possible
-# * show		do_show()
-# * list		do_list()
-# * set			do_set()
-# * update		do_update()
-#
-# Behaviour:
-# do_show():
-#	Checks if /usr/bin/emacs is a link and if the target exists,
-#	if yes, it outputs the currently linked Emacs version.
-#	If it is no symlink, the user is told so, the same if there is
-#	no /usr/bin/emacs or the target does not exist.
-# do_list(): List all available versions of GNU Emacs
-# do_set(): Set a version to be target of the symlink.
-# do_update(): Set the target to the highest version available
-#	(optionally: only if not set)
-
-DESCRIPTION="Manage /usr/bin/emacs version"
-MAINTAINER="emacs@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# ctags is handled in an own module now
-BINARYLIST="emacsclient etags b2m ebrowse rcs-checkin grep-changelog"
-MANPAGELIST="emacs emacsclient etags gfdl"
-
-find_targets() {
-	# Return the list of available Emacs binaries
-	local j
-	for j in "${ROOT}"/usr/bin/emacs-[0-9]*; do
-		[[ -f ${j} ]] && basename ${j}
-	done
-}
-
-remove_infopath() {
-	# When cleaning symlinks this takes care of the info documentation settings
-	rm -f "${ROOT}/etc/env.d/50emacs"
-}
-
-# Define INFOPATH environment variable in env file
-set_infopath() {
-	[[ -d "${ROOT}"/usr/share/info/${1} ]] || return 1
-	echo "INFOPATH=/usr/share/info/${1}" > "${ROOT}/etc/env.d/50emacs"
-}
-
-remove_symlinks() {
-	# Remove existing symlinks to binaries, man pages,
-	# and the env file (own function)
-	local f
-	rm -f "${ROOT}"/usr/bin/emacs
-	for f in ${BINARYLIST}; do
-		rm -f "${ROOT}"/usr/bin/${f}
-	done
-	for f in ${MANPAGELIST}; do
-		rm -f "${ROOT}"/usr/share/man/man1/${f}.1*
-	done
-	remove_infopath
-}
-
-set_bin_symlinks() {
-	# Set symlinks to binaries in /usr/bin/
-	local target=${1} f
-	for f in ${BINARYLIST}; do
-		# set symlink only if target binary actually exists
-		if [[ -f "${ROOT}/usr/bin/${f}-${target}" ]]; then
-			ln -s "${f}-${target}" "${ROOT}/usr/bin/${f}" ||
-				die "Couldn't set ${f}-${target} ${ROOT}/usr/bin/${f} symlink"
-		fi
-	done
-}
-
-set_man_symlinks() {
-	# Set symlinks to man pages
-	local target=${1} extension f i
-	for f in ${MANPAGELIST}; do
-		for i in "${ROOT}"/usr/share/man/man1/${f}-${target}.1*; do
-			if [[ -f ${i} ]]; then
-				# target file exists; determine compress extension
-				extension=${i##*/${f}-${target}.1}
-				ln -s "${f}-${target}.1${extension}" \
-					"${ROOT}/usr/share/man/man1/${f}.1${extension}"
-			fi
-		done
-	done
-}
-
-set_symlinks() {
-	# Set symlinks to binaries and man pages, update info path
-	local target="${1}" targets
-	# target may be specified by its name or its index
-	if is_number "${target}"; then
-		# numeric index, find the target's name
-		targets=( $(find_targets) )
-		[[ ${target} -ge 1 && ${target} -le ${#targets[@]} ]] \
-			|| die -q "Number out of range: ${1}"
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-
-	# is the target valid, i.e. does an Emacs binary with this name exist?
-	[[ -f "${ROOT}/usr/bin/${target}" ]] \
-		|| die -q "Target \"${1}\" doesn't appear to be valid!"
-
-	echo "Switching to ${target} ..."
-	remove_symlinks || die -q "Couldn't remove existing symlink"
-	# the main /usr/bin/emacs symlink is only set for Emacs binaries
-	# (but not for other providers of auxiliary programs, e.g., XEmacs)
-	if [[ ${target} == emacs-* ]]; then
-		ln -s "${target}" "${ROOT}/usr/bin/emacs" \
-			|| die "Couldn't set ${target} ${ROOT}/usr/bin/emacs symlink"
-	fi
-	set_bin_symlinks "${target}"
-	set_man_symlinks "${target}"
-	set_infopath "${target}"
-
-	# update /etc/profile.env from /etc/env.d files
-	# requires >=eselect-1.0.10 for "noldconfig" option
-	do_action env update noldconfig
-
-	return 0
-}
-
-xemacs_info() {
-	# This is just informational to tell that XEmacs has been found,
-	# a wish from graaff
-	if [[ -e "${ROOT}/usr/bin/xemacs" ]]; then
-		echo
-		write_list_start "XEmacs is also installed"
-	fi
-}
-
-vim_info() {
-	# Don't take this too serious
-	if [[ -e "${ROOT}/usr/bin/vi" ]]; then
-		echo
-		write_list_start "Vi found, your system is in real trouble now!"
-	fi
-}
-
-test_for_root() {
-	# checks if the user has rights to modify /usr/bin/
-	[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current target of the Emacs symlink"
-}
-
-do_show() {
-	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
-
-	write_list_start "Current target of GNU Emacs symlink:"
-	if [[ -L "${ROOT}/usr/bin/emacs" && \
-		  -e $(canonicalise "${ROOT}/usr/bin/emacs") ]]; then
-		write_kv_list_entry \
-			$(basename $(canonicalise "${ROOT}/usr/bin/emacs") ) ""
-	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
-		write_kv_list_entry \
-			"(not a symlink or target of symlink does not exist)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-	xemacs_info
-	#vim_info
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available Emacs symlink targets"
-}
-
-do_list() {
-	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
-
-	local i targets
-	targets=( $(find_targets) )
-
-	if [[ -n ${targets[@]} ]]; then
-		for (( i = 0; i < ${#targets[@]}; i = i + 1 )); do
-			# Display a star to indicate the currently chosen version
-			[[ ${targets[${i}]} = \
-				$(basename $(canonicalise "${ROOT}/usr/bin/emacs") ) ]] \
-				&& targets[${i}]="${targets[${i}]} $(highlight '*')"
-		done
-		write_list_start "Available GNU Emacs symlink targets:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-	xemacs_info
-	#vim_info
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new Emacs symlink"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	[[ -z "${1}" ]] && die -q "You didn't tell me what to set the symlink to"
-	[[ ${#@} -gt 1 ]] && die -q "Too many parameters"
-	test_for_root
-
-	if [[ -e "${ROOT}/usr/bin/emacs" && ! -L "${ROOT}/usr/bin/emacs" ]]; then
-		die -q "Sorry, ${ROOT}/usr/bin/emacs exists but is not a symlink"
-	fi
-
-	set_symlinks "${1}" || die -q "Couldn't set a new symlink"
-
-	# ctags symlinks are handled in an own module now
-	do_action ctags update
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the Emacs symlink"
-}
-
-describe_update_options() {
-	echo "ifunset : Do not override currently set version"
-}
-
-do_update() {
-	[[ -z "${1}" || "${1}" == "ifunset" || "${1}" == "--if-unset" ]] \
-		|| die -q "Usage error"
-	[[ ${#@} -gt 1 ]] && die -q "Too many parameters"
-	test_for_root
-
-	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
-		[[ ${1} == *if*unset && -e $(canonicalise "${ROOT}/usr/bin/emacs") ]] \
-			&& return
-		# this is not redundant: "update" is called in pkg_postrm() of emacs
-		# and should clean up any dead symlinks if no valid target exists
-		remove_symlinks || die -q "Couldn't remove existing symlink"
-	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
-		die -q "Sorry, ${ROOT}/usr/bin/emacs exists but is not a symlink"
-	fi
-
-	local targets=( $(find_targets) )
-	if [[ ${#targets[@]} -gt 0 ]]; then
-		set_symlinks ${#targets[@]} || die -q "Couldn't set a new symlink"
-	elif [[ -f "${ROOT}/usr/bin/xemacs" ]]; then
-		# no Emacs target found -- link ctags, etags etc. to XEmacs versions
-		set_symlinks xemacs
-	fi
-
-	# ctags symlinks are handled in an own module now
-	do_action ctags update
-}

diff --git a/emacs.eselect.5 b/emacs.eselect.5
deleted file mode 100644
index 98d897f..0000000
--- a/emacs.eselect.5
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" Copyright 1999-2007 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
-.\" $Id$
-.\"
-.TH "ESELECT" "5" "August 2007" "Gentoo Linux" "eselect"
-.SH "NAME"
-emacs.eselect \- The Emacs management module for Gentoo's eselect
-.SH "SYNOPSIS"
-\fBeselect emacs\fR [\fBhelp\fR|\fBusage\fR]
-.br
-\fBeselect emacs list\fR
-.br
-\fBeselect emacs set\fR \fItarget\fR
-.br
-\fBeselect emacs show\fR
-.br
-\fBeselect emacs update\fR [\fIifunset\fR]
-.SH "DESCRIPTION"
-\fBeselect\fR is Gentoo's configuration and management tool. It features
-modules that care for the individual administrative tasks.
-.SH "ACTION: LIST"
-\fBeselect emacs list\fR
-.br
-List all installed Emacs versions and even informs you if XEmacs has
-been found on your system.
-
-# eselect emacs list
-.br
-Available GNU Emacs symlink targets:
-.br
-  [1]   emacs-18
-  [2]   emacs-21 *
-  [3]   emacs-22
-.SH "ACTION: SET"
-\fBeselect emacs set\fR \fItarget\fR
-.br
-Activates the selected Emacs version. \fItarget\fR can be either an
-identification number given by \fBeselect emacs list\fR or the name of
-one installed version.
-
-# eselect emacs set 3
-.br
-Switching to emacs-22 ...
-.br
-Switching to ctags-emacs-22 ...
-.SH "ACTION: SHOW"
-\fBeselect emacs show\fR
-.br
-Prints the currently activated Emacs version.
-
-# eselect emacs show
-.br
-Current target of GNU Emacs symlink:
-.br
-  emacs-22
-.SH "ACTION: UPDATE"
-\fBeselect emacs update\fR [\fIifunset\fR]
-.br
-Update the emacs symlink to the last available version. If option
-[\fIifunset\fR] is given, an existing implementation is not
-overridden.
-
-# eselect emacs update
-.br
-Switching to emacs-22 ...
-.br
-Switching to ctags-emacs-22 ...
-.SH "AUTHOR"
-Christian Faulhammer <opfer@gentoo.org>
-.br
-Ulrich Mueller <ulm@gentoo.org>
-.SH "SEE ALSO"
-.BR eselect (1),
-.BR ctags.eselect (5)
-.SH "REVISION"
-$Id$



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e008648fbb7c0aa764d0940aa36bc3cfbecb66de
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 12 08:58:42 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Dec 12 08:58:42 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=e008648f

Add ulm as author

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

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

diff --git a/ChangeLog b/ChangeLog
index 2a9ea68..534835d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-12  Christian Faulhammer  <opfer@gentoo.org>
+
+	* emacs-updater.sh: Add ulm as author
+
 2007-12-12  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater.sh: Make "Processing" message more informative.

diff --git a/emacs-updater.sh b/emacs-updater.sh
index 590c1be..dcbf0e3 100755
--- a/emacs-updater.sh
+++ b/emacs-updater.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 # Licensed under GPL version 2
-# Author Christian Faulhammer <opfer@gentoo.org>
+# Authors:
+# Christian Faulhammer <opfer@gentoo.org>
+# Ulrich Mueller <ulm@gentoo.org>
 
 # Only set colours if output is not redirected
 if tty -s <&1; then



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

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

Make "Processing" message more informative.
Don't ask users to report all rebuilt packages as bugs.
Break some long lines.

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

---
 ChangeLog        |    6 ++++++
 emacs-updater.sh |   21 +++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29ff43a..7467d12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-12  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater.sh: Make "Processing" message more informative.
+	Don't ask users to report all rebuilt packages as bugs.
+	Break some long lines.
+
 2007-12-06  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater.sh: Test for existence of non-empty temp file;

diff --git a/emacs-updater.sh b/emacs-updater.sh
index 392ebae..a93471a 100755
--- a/emacs-updater.sh
+++ b/emacs-updater.sh
@@ -34,12 +34,16 @@ failure() {
     echo "${RED}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}" 
 }
 
-echo
-echo "Emacs updater version ${VERSION}"
-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! "
+cat <<-EOF
+
+Emacs updater version ${VERSION}
+Written by the Gentoo Emacs team http://www.gentoo.org/proj/en/lisp/emacs/
+Find packages that are installed in the wrong location
+
+EOF
+
+warning "Note, you must use the eclasses from the Emacs Overlay"
+warning "for proper operation!"
 echo
 
 if ! [ -x /usr/bin/qfile ]; then
@@ -50,7 +54,7 @@ fi
 
 for sf in "${ROOT}/${SITELISP}"/[0-9][0-9]*-gentoo.el
 do
-    message "Processing ..."
+    message "Processing ${sf##*/} ..."
     qfile -qC "${sf}" >> "${TMPFILE}"
 done
 echo
@@ -77,4 +81,5 @@ esac
 
 emerge -av $(cat "${TMPFILE}")
 
-warning "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,"
+warning "please report it on http://bugs.gentoo.org/"



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

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
 



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     978dc627e80e5361a9907582368f6598f6d9501b
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 12:11:55 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Dec 14 12:11:55 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=978dc627

rename file (remove .sh suffix)

svn path=/emacs-extra/emacs-updater/; revision=862

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

diff --git a/ChangeLog b/ChangeLog
index 6cc855e..e3c38d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-14  Christian Faulhammer  <opfer@gentoo.org>
+
+	* emacs-updater: rename file (remove .sh suffix)
+
 2007-12-12  Christian Faulhammer  <opfer@gentoo.org>
 
 	* emacs-updater.sh: Add ulm as author



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     d38369a9a5352797127c9535260909206a1964cd
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 12:13:05 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Dec 14 12:13:05 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=d38369a9

Actually do the change

svn path=/emacs-extra/emacs-updater/; revision=863

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

diff --git a/emacs-updater.sh b/emacs-updater
similarity index 100%
rename from emacs-updater.sh
rename to emacs-updater



^ permalink raw reply	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     6d75f5bd43817a856daa854fe3e534320318e25e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 09:49:33 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 09:49:33 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=6d75f5bd

Remove warning; the eclasses are official now.

svn path=/emacs-extra/emacs-updater/; revision=896

---
 ChangeLog     |    4 ++++
 emacs-updater |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc8967e..8705e5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-29  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater: Remove warning; the eclasses are official now.
+
 2007-12-14  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater: Use long options for emerge.

diff --git a/emacs-updater b/emacs-updater
index 5d582ea..bf5859a 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -44,10 +44,6 @@ Find packages that are installed in the wrong location
 
 EOF
 
-warning "Note, you must use the eclasses from the Emacs Overlay"
-warning "for proper operation!"
-echo
-
 if ! [ -x /usr/bin/qfile ]; then
     echo
     failure "Please emerge app-portage/portage-utils to use this tool"



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     b9192a9bcf6ef6e35aaf4ef046bf4091f608db49
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 20:34:05 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Dec 14 20:34:05 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=b9192a9b

Use long options for emerge.
Add --oneshot in order to keep the world file tidy.

svn path=/emacs-extra/emacs-updater/; revision=866

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

diff --git a/ChangeLog b/ChangeLog
index e3c38d1..bc8967e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-14  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater: Use long options for emerge.
+	Add --oneshot in order to keep the world file tidy.
+
 2007-12-14  Christian Faulhammer  <opfer@gentoo.org>
 
 	* emacs-updater: rename file (remove .sh suffix)

diff --git a/emacs-updater b/emacs-updater
index dcbf0e3..5d582ea 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -82,7 +82,7 @@ case "${choice}" in
 	exit 10 ;;
 esac
 
-emerge -av $(cat "${TMPFILE}")
+emerge --oneshot --ask --verbose $(cat "${TMPFILE}")
 
 warning "If a package is being rebuilt over and over again,"
 warning "please report it on http://bugs.gentoo.org/"



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     5e69dad211267bfda592bd1689ec678f535b3bec
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 10:03:15 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 10:03:15 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=5e69dad2

Add Makefile.

svn path=/emacs-extra/emacs-updater/; revision=897

---
 ChangeLog     |    3 +++
 Makefile      |   20 ++++++++++++++++++++
 emacs-updater |    2 +-
 3 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8705e5a..815bc02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2007-12-29  Ulrich Mueller  <ulm@gentoo.org>
 
+	* Makefile: New file.
+
 	* emacs-updater: Remove warning; the eclasses are official now.
+	Change version to 0.3.
 
 2007-12-14  Ulrich Mueller  <ulm@gentoo.org>
 

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0758c75
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+# This Makefile creates the tarball to be uploaded to the Gentoo mirrors
+#
+
+PN = emacs-updater
+PV = $(shell sed '/^VERSION/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' emacs-updater)
+P = $(PN)-$(PV)
+
+DISTFILES = emacs-updater ChangeLog
+
+
+.PHONY: all dist clean
+
+all:
+
+dist: $(DISTFILES)
+	tar -cjf $(P).tar.bz2 --transform='s%^%$(P)/%' $^
+	tar -tjvf $(P).tar.bz2
+
+clean:
+	-rm -f *~ *.tmp *.gz *.bz2

diff --git a/emacs-updater b/emacs-updater
index bf5859a..6b9539f 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -17,7 +17,7 @@ if tty -s <&1; then
 fi
 
 SITELISP=/usr/share/emacs/site-lisp
-VERSION=0.2
+VERSION=0.3
 TMPFILE="$(mktemp /tmp/emacs-updater.XXXXXX)"
 
 



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     16a9251aef4bee60ab44bf92378997e75f209532
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 22:32:02 2008 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 22:32:02 2008 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=16a9251a

Change keyword to Id for subversion.

svn path=/emacs-extra/emacs-updater/; revision=973

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

diff --git a/emacs-updater b/emacs-updater
index 2ec8647..8f6f8a0 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -2,7 +2,7 @@
 
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 # Authors:
 # Christian Faulhammer <opfer@gentoo.org>



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     767ca66e8c6184c6343bbd9fd06a0aba1c040e5d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 22:28:39 2008 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 22:28:39 2008 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=767ca66e

Use tput instead of hardcoded escape sequences.

svn path=/emacs-extra/emacs-updater/; revision=972

---
 ChangeLog     |    5 +++++
 emacs-updater |   24 ++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 465fbe5..5d128a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-22  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater: Use tput instead of hardcoded escape sequences.
+	Add standard copyright notice. Change version to 0.5.
+
 2008-02-03  Christian Faulhammer  <opfer@gentoo.org>
 
 	* emacs-updater: Move informational message to the top, so it is

diff --git a/emacs-updater b/emacs-updater
index 51e09eb..2ec8647 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,11 +1,14 @@
 #!/bin/bash
 
-# Licensed under GPL version 2
+# Copyright 2007-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
 # Authors:
 # Christian Faulhammer <opfer@gentoo.org>
 # Ulrich Mueller <ulm@gentoo.org>
 
-VERSION=0.4
+VERSION=0.5
 SITELISP=/usr/share/emacs/site-lisp
 TMPFILE="$(mktemp /tmp/emacs-updater.XXXXXX)"
 
@@ -35,14 +38,15 @@ done
 
 # Only set colours if output is not redirected or the --no-colour
 # option is not set
-if tty -s <&1 && [ -z ${NOCOLOUR} ] ; then
-    BLUE=$'\e[34;01m'
-    GREEN=$'\e[32;01m'
-    RED=$'\e[31;01m'
-    YELLOW=$'\e[33;01m'
-    CYAN=$'\e[36;01m'
-    BOLD=$'\e[0;01m'
-    NORMAL=$'\e[0m'
+if [ -t 1 ] && [ -z "${NOCOLOUR}" ] ; then
+    RED=$(tput setaf 1; tput bold)
+    GREEN=$(tput setaf 2; tput bold)
+    YELLOW=$(tput setaf 3; tput bold)
+    BLUE=$(tput setaf 4; tput bold)
+    MAGENTA=$(tput setaf 5; tput bold)
+    CYAN=$(tput setaf 6; tput bold)
+    BOLD=$(tput bold)
+    NORMAL=$(tput sgr0)
 fi
 
 message() {



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     a0a8e07857bcfb599292bbe7fa473dcdf0a5faca
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 22:46:30 2008 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 22:46:30 2008 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=a0a8e078

Use previously calculated bold string.

svn path=/emacs-extra/emacs-updater/; revision=974

---
 emacs-updater |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/emacs-updater b/emacs-updater
index 8f6f8a0..ca827c5 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -39,14 +39,14 @@ done
 # Only set colours if output is not redirected or the --no-colour
 # option is not set
 if [ -t 1 ] && [ -z "${NOCOLOUR}" ] ; then
-    RED=$(tput setaf 1; tput bold)
-    GREEN=$(tput setaf 2; tput bold)
-    YELLOW=$(tput setaf 3; tput bold)
-    BLUE=$(tput setaf 4; tput bold)
-    MAGENTA=$(tput setaf 5; tput bold)
-    CYAN=$(tput setaf 6; tput bold)
-    BOLD=$(tput bold)
-    NORMAL=$(tput sgr0)
+    NORMAL="$(tput sgr0)"
+    BOLD="$(tput bold)"
+    RED="$(tput setaf 1)${BOLD}"
+    GREEN="$(tput setaf 2)${BOLD}"
+    YELLOW="$(tput setaf 3)${BOLD}"
+    BLUE="$(tput setaf 4)${BOLD}"
+    MAGENTA="$(tput setaf 5)${BOLD}"
+    CYAN="$(tput setaf 6)${BOLD}"
 fi
 
 message() {



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     b680aac1d535fdd5bd916178903e1be112baa9e9
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 07:58:53 2008 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 07:58:53 2008 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=b680aac1

Number of packages that need a remerge is calculated and displayed

svn path=/emacs-extra/emacs-updater/; revision=980

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

diff --git a/ChangeLog b/ChangeLog
index 5d128a1..2f82317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-25  Christian Faulhammer  <opfer@gentoo.org>
+
+	* emacs-updater: Number of packages that need a remerge is
+	calculated and displayed
+
 2008-02-22  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater: Use tput instead of hardcoded escape sequences.

diff --git a/emacs-updater b/emacs-updater
index fa2cd37..eccf9da 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -8,7 +8,7 @@
 # Christian Faulhammer <opfer@gentoo.org>
 # Ulrich Mueller <ulm@gentoo.org>
 
-VERSION=0.5
+VERSION=0.5.1
 SITELISP=/usr/share/emacs/site-lisp
 TMPFILE="$(mktemp /tmp/emacs-updater.XXXXXX)"
 
@@ -83,7 +83,9 @@ if [ ! -s "${TMPFILE}" ]; then
     exit 2
 fi
 
-message "Packages with site files in the wrong location:"
+NO_OF_PACKAGES=$(wc -l ${TMPFILE} | awk '{ print $1 }')
+
+message "${NO_OF_PACKAGES} packages with site files in the wrong location:"
 cat "${TMPFILE}"
 
 if [ "${PRETEND}" ]; then



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     14bc65b58abaf23bee59fd211beb44a3609dda14
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 23 08:46:27 2008 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 08:46:27 2008 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=14bc65b5

Fix colour definitions.

svn path=/emacs-extra/emacs-updater/; revision=975

---
 emacs-updater |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/emacs-updater b/emacs-updater
index ca827c5..d82deff 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -39,14 +39,14 @@ done
 # Only set colours if output is not redirected or the --no-colour
 # option is not set
 if [ -t 1 ] && [ -z "${NOCOLOUR}" ] ; then
-    NORMAL="$(tput sgr0)"
-    BOLD="$(tput bold)"
-    RED="$(tput setaf 1)${BOLD}"
-    GREEN="$(tput setaf 2)${BOLD}"
-    YELLOW="$(tput setaf 3)${BOLD}"
-    BLUE="$(tput setaf 4)${BOLD}"
-    MAGENTA="$(tput setaf 5)${BOLD}"
-    CYAN="$(tput setaf 6)${BOLD}"
+    RED=$(tput -S <<<$'setaf 1\nbold')
+    GREEN=$(tput -S <<<$'setaf 2\nbold')
+    YELLOW=$(tput -S <<<$'setaf 3\nbold')
+    BLUE=$(tput -S <<<$'setaf 4\nbold')
+    MAGENTA=$(tput -S <<<$'setaf 5\nbold')
+    CYAN=$(tput -S <<<$'setaf 6\nbold')
+    BOLD=$(tput bold)
+    NORMAL=$(tput sgr0)
 fi
 
 message() {



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     a5e1fae46ce3522cf86cb0dfbd584415b4332f54
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 07:52:55 2008 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 07:52:55 2008 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=a5e1fae4

add quotes around a variable, not really needed, just for safety

svn path=/emacs-extra/emacs-updater/; revision=979

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

diff --git a/emacs-updater b/emacs-updater
index d82deff..fa2cd37 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -86,7 +86,7 @@ fi
 message "Packages with site files in the wrong location:"
 cat "${TMPFILE}"
 
-if [ ${PRETEND} ]; then
+if [ "${PRETEND}" ]; then
     exit 3
 fi
 



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     29d76aeda536fd2ed27c6b7144b5f46f953481f4
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 17:11:42 2008 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 17:11:42 2008 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=29d76aed

Make ulm happy

svn path=/emacs-extra/emacs-updater/; revision=981

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

diff --git a/emacs-updater b/emacs-updater
index eccf9da..6aca87c 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -83,7 +83,7 @@ if [ ! -s "${TMPFILE}" ]; then
     exit 2
 fi
 
-NO_OF_PACKAGES=$(wc -l ${TMPFILE} | awk '{ print $1 }')
+NO_OF_PACKAGES=$(sed -n '$=' "${TMPFILE}")
 
 message "${NO_OF_PACKAGES} packages with site files in the wrong location:"
 cat "${TMPFILE}"



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     b0b77d9b213efe47f047485fc25f7a7658eef657
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 29 20:52:03 2008 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Feb 29 20:52:03 2008 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=b0b77d9b

Check for getopt exit status. Add usage function.

svn path=/emacs-extra/emacs-updater/; revision=984

---
 ChangeLog     |    4 ++++
 emacs-updater |   21 ++++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f82317..ebe9839 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-29  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater: Check for getopt exit status. Add usage function.
+
 2008-02-25  Christian Faulhammer  <opfer@gentoo.org>
 
 	* emacs-updater: Number of packages that need a remerge is

diff --git a/emacs-updater b/emacs-updater
index d905e20..b22e46b 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -8,7 +8,7 @@
 # Christian Faulhammer <opfer@gentoo.org>
 # Ulrich Mueller <ulm@gentoo.org>
 
-VERSION=0.5.1
+VERSION=0.6
 SITELISP=/usr/share/emacs/site-lisp
 TMPFILE="$(mktemp /tmp/emacs-updater.XXXXXX)"
 
@@ -20,19 +20,30 @@ Find packages that are installed in the wrong location
 
 EOF
 
+usage() {
+    sed -e 's/^X//' <<-EOF
+	Usage: ${0##*/} [OPTION]...
+	X  -n, --nocolour   disable colour in output
+	X  -p, --pretend    don't actually emerge packages
+	X  -h, --help       display this help and exit
+	EOF
+    exit $1
+}
+
 # Read in all command-line options and force English output
 OPTIONS=$(LC_ALL=C getopt -o hpn --long help,pretend,nocolour \
      -n 'emacs-updater' -- "$@")
+[ $? -eq 0 ] || usage 1
 
 eval set -- "${OPTIONS}"
 
 while true
 do
     case "${1}" in
-	-h|--help) echo "You have the following options: --pretend|-p and/or --no-colour|-n" ; exit 0 ;;
-	-p|--pretend) PRETEND="true"; shift 1 ;;
-	-n|--nocolour) NOCOLOUR="true"; shift 1;;
-	--) shift ; break ;;
+	-h|--help)      usage 0 ;;
+	-p|--pretend)   PRETEND="true"; shift 1 ;;
+	-n|--nocolour)  NOCOLOUR="true"; shift 1 ;;
+	--)             shift; break ;;
     esac
 done
 



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     3c105e37b3acf8d0859906fd45aec4ae771f8381
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 11:45:41 2008 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 11:45:41 2008 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=3c105e37

Fix grammar: use correct singular form.

svn path=/emacs-extra/emacs-updater/; revision=982

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

diff --git a/emacs-updater b/emacs-updater
index 6aca87c..d905e20 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -85,7 +85,8 @@ fi
 
 NO_OF_PACKAGES=$(sed -n '$=' "${TMPFILE}")
 
-message "${NO_OF_PACKAGES} packages with site files in the wrong location:"
+[ ${NO_OF_PACKAGES} -eq 1 ] && s= || s=s
+message "${NO_OF_PACKAGES} package${s} with site files in the wrong location:"
 cat "${TMPFILE}"
 
 if [ "${PRETEND}" ]; then



^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     ba0997adb1567c3588c132ea2fe272ad6296af73
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  2 23:42:20 2008 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Mar  2 23:42:20 2008 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=ba0997ad

Some brackets

svn path=/emacs-extra/emacs-updater/; revision=1008

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

diff --git a/emacs-updater b/emacs-updater
index b22e46b..9483dbb 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -27,7 +27,7 @@ usage() {
 	X  -p, --pretend    don't actually emerge packages
 	X  -h, --help       display this help and exit
 	EOF
-    exit $1
+    exit ${1}
 }
 
 # Read in all command-line options and force English output



^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2012-05-06 16:24 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-06 16:07 [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1030 commit in: / Sebastian Pipping
  -- strict thread matches above, loose matches on Subject: below --
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:07 Sebastian Pipping

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox