[gentoo-commits] proj/emacs-tools:emacs-updater commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     618c887cc72189c67ec4ac72873c5a8de46bdba2
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 19 18:14:01 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 19 18:14:01 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=618c887c

Remove the sitedir action.

* emacs-updater: Remove the sitedir action; site-init files are
installed in the new location since 2007.
(action_sitedir): Function removed.
(usage): Update help text accordingly.
* emacs-updater.8: Update.

---
 ChangeLog       |  8 ++++++++
 emacs-updater   | 30 ++++++------------------------
 emacs-updater.8 |  4 ----
 3 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a00d5a4..86d9d16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-05-19  Ulrich Müller  <ulm@gentoo.org>
+
+	* emacs-updater: Remove the sitedir action; site-init files are
+	installed in the new location since 2007.
+	(action_sitedir): Function removed.
+	(usage): Update help text accordingly.
+	* emacs-updater.8: Update.
+
 2013-08-09  Ulrich Müller  <ulm@gentoo.org>
 
 	* emacs-updater (version): Update URI of Emacs project page.

diff --git a/emacs-updater b/emacs-updater
index 4eb9c85..3971de0 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -11,7 +11,7 @@ EMACS=/usr/bin/emacs
 SITELISP=/usr/share/emacs/site-lisp
 
 # Default actions
-ACTIONS="sitedir rebuild"
+ACTIONS="rebuild"
 
 # Default package manager
 PM_COMMAND=pm_auto
@@ -33,13 +33,11 @@ usage() {
 	X
 	X  -a, --action=ACTION[,ACTION]...
 	X                        specify actions, comma-separated list of:
-	X                        sitedir: find site-init files not in the
-	X                          new-style location
 	X                        rebuild: rebuild packages with elisp files
 	X                          byte-compiled by a different Emacs version
 	X                        all: rebuild all packages that have
 	X                          byte-compiled elisp files
-	X                        (default: sitedir,rebuild)
+	X                        (default: rebuild)
 	X  -b, --batch           batch mode, don't ask any questions
 	X      --color[=MODE], --colour[=MODE]
 	X                        control colour output. MODE is yes, no,
@@ -141,9 +139,12 @@ do
 	    ACTIONS=
 	    for action in ${2/,/ }; do
 		case ${action} in
-		    sitedir|rebuild|all)
+		    rebuild|all)
 			ACTIONS="${ACTIONS}${ACTIONS:+ }${action}"
 			;;
+		    sitedir)
+			echo "Obsolete action '$action' ignored."
+			;;
 		    *)
 			echo "Invalid action '$action' given!"
 			usage 1
@@ -227,25 +228,6 @@ bytecomp_version() {
     sed -n '/^[^;]/q;s/\.$//;s/.*[Ee]macs version \([0-9].*\)/\1/p' "$1"
 }
 
-action_sitedir() {
-    local sf
-
-    message "Searching for site-init files in obsolete location ..."
-
-    # Set nullglob option since there may be no matching files
-    local old_shopts=$(shopt -p nullglob)
-    shopt -s nullglob
-
-    for sf in "${ROOT}${SITELISP}"/[0-9][0-9]*-gentoo.el
-    do
-	echo "Found ${sf##*/}"
-	echo "${sf}" >> "${TMPFILE}"
-    done
-
-    eval "${old_shopts}"
-    echo
-}
-
 action_rebuild() {
     local active version elc ret
 

diff --git a/emacs-updater.8 b/emacs-updater.8
index e2ed0e2..f6a5ae3 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -16,9 +16,6 @@ GNU Emacs packages.
 .BI "-a, --action=" ACTION[,ACTION]...
 Specify actions, comma-separated list of:
 
-.BR sitedir :
-Find site-init files not in the new-style location.
-
 .BR rebuild :
 Rebuild packages with Elisp files byte-compiled by a different Emacs
 version.
@@ -27,7 +24,6 @@ version.
 Rebuild all packages that have byte-compiled Elisp files.
 
 (default:
-.BR sitedir ,
 .BR rebuild )
 .TP
 .B -b, --batch