* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:07 ` [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1480 " Sebastian Pipping
0 siblings, 1 reply; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 21b7b6eb0946a5459eb277d4f61b236d4db84a35
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 06:44:37 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 06:44:37 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=21b7b6eb
Be more verbose in orphan mode.
svn path=/emacs-updater/; revision=1384
---
emacs-updater | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/emacs-updater b/emacs-updater
index f6d0c5a..8832fed 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -260,7 +260,7 @@ NO_OF_FILES=$(sed -n '$=' "${TMPFILE}")
message "Assigning ${NO_OF_FILES} file${s} to packages ..."
if [ "${ORPHANS}" ]; then
- qfile -oCR -f "${TMPFILE}" | sort -u
+ qfile -oCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
elif [ "${EXACT}" ]; then
qfile -eqCR -f "${TMPFILE}" | sort -u | sed 's/^/=/' > "${PKGFILE}"
else
@@ -276,11 +276,15 @@ fi
NO_OF_PACKAGES=$(sed -n '$=' "${PKGFILE}")
[ ${NO_OF_PACKAGES} -eq 1 ] && s= || s=s
-message "${NO_OF_PACKAGES} package${s} to remerge:"
+if [ "${ORPHANS}" ]; then
+ message "${NO_OF_PACKAGES} orphan file${s} found:"
+else
+ message "${NO_OF_PACKAGES} package${s} to remerge:"
+fi
cat "${PKGFILE}"
-if [ "${PRETEND}" ]; then
+if [ "${PRETEND}" -o "${ORPHANS}" ]; then
exit 4
fi
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1480 commit in: /
2012-05-06 16:06 [gentoo-commits] proj/emacs-tools:emacs-updater commit in: / Sebastian Pipping
@ 2012-05-06 16:07 ` Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 21b7b6eb0946a5459eb277d4f61b236d4db84a35
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 06:44:37 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 06:44:37 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=21b7b6eb
Be more verbose in orphan mode.
svn path=/emacs-updater/; revision=1384
---
emacs-updater | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/emacs-updater b/emacs-updater
index f6d0c5a..8832fed 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -260,7 +260,7 @@ NO_OF_FILES=$(sed -n '$=' "${TMPFILE}")
message "Assigning ${NO_OF_FILES} file${s} to packages ..."
if [ "${ORPHANS}" ]; then
- qfile -oCR -f "${TMPFILE}" | sort -u
+ qfile -oCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
elif [ "${EXACT}" ]; then
qfile -eqCR -f "${TMPFILE}" | sort -u | sed 's/^/=/' > "${PKGFILE}"
else
@@ -276,11 +276,15 @@ fi
NO_OF_PACKAGES=$(sed -n '$=' "${PKGFILE}")
[ ${NO_OF_PACKAGES} -eq 1 ] && s= || s=s
-message "${NO_OF_PACKAGES} package${s} to remerge:"
+if [ "${ORPHANS}" ]; then
+ message "${NO_OF_PACKAGES} orphan file${s} found:"
+else
+ message "${NO_OF_PACKAGES} package${s} to remerge:"
+fi
cat "${PKGFILE}"
-if [ "${PRETEND}" ]; then
+if [ "${PRETEND}" -o "${ORPHANS}" ]; then
exit 4
fi
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2024-06-05 14:08 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2024-06-05 14:08 UTC (permalink / raw
To: gentoo-commits
commit: ac3052c13e3618eac170d036c5d39bf4db406028
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 14:07:43 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 14:07:43 2024 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=ac3052c1
Update a comment
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
emacs-updater | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/emacs-updater b/emacs-updater
index 2936b64..1926218 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -205,7 +205,7 @@ else
BOLD=; NORMAL=; RED=; GREEN=; YELLOW=; BLUE=; MAGENTA=; CYAN=
fi
-# Some type of output can be prettified and capsulated in functions
+# Some functions for output
message() {
local OUTPUT="$@"
echo "${GREEN}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2024-05-02 16:52 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2024-05-02 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 85014db5f84c2bc52d9314c7490b7277573204f6
Author: Arsen Arsenović <arsen <AT> gentoo <DOT> org>
AuthorDate: Wed May 1 21:04:19 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu May 2 16:12:33 2024 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=85014db5
Pass --usepkg=n to Portage
* emacs-updater (pm_portage): Pass --usepkg=n to Portage.
Fixes bug 931064.
Bug: https://bugs.gentoo.org/931064
Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ChangeLog | 5 +++++
emacs-updater | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index f4e8a2b..2dc5440 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-05-01 Arsen Arsenović <arsen@gentoo.org>
+
+ * emacs-updater (pm_portage): Pass --usepkg=n to Portage.
+ Fixes bug 931064.
+
2023-09-25 Ulrich Müller <ulm@gentoo.org>
* Version 1.17 released.
diff --git a/emacs-updater b/emacs-updater
index 6d03c34..c1ac43e 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -79,7 +79,7 @@ version() {
# Wrapper for package manager commands
have_portage() { type -P emerge >/dev/null; }
-pm_portage() { emerge --oneshot "$@"; }
+pm_portage() { emerge --usepkg=n --oneshot "$@"; }
have_pkgcore() { type -P pmerge >/dev/null; }
pm_pkgcore() { pmerge --oneshot "$@"; }
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2024-05-02 16:52 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2024-05-02 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 455a245dd327a8f18f77986662214206aa50d490
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May 2 16:18:15 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu May 2 16:18:15 2024 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=455a245d
Respect NO_COLOR
* emacs-updater (COLOUR): Respect the NO_COLOR environment
variable.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ChangeLog | 5 +++++
emacs-updater | 6 ++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2dc5440..6323e0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-05-02 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs-updater (COLOUR): Respect the NO_COLOR environment
+ variable.
+
2024-05-01 Arsen Arsenović <arsen@gentoo.org>
* emacs-updater (pm_portage): Pass --usepkg=n to Portage.
diff --git a/emacs-updater b/emacs-updater
index c1ac43e..34fd89b 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2007-2023 Gentoo Authors
+# Copyright 2007-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 or later
# Authors:
@@ -20,12 +20,14 @@ PM_EXTRAOPTS=( )
# Other default variable settings
BATCH=
-COLOUR=
EXACT=
MAJOR=
ORPHANS=
PRETEND=
+# Check for NO_COLOR environment variable: https://no-color.org/
+COLOUR=${NO_COLOR:+no}
+
usage() {
sed -e 's/^X//' <<-EOF
Usage: ${0##*/} [OPTION]...
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2024-05-02 16:52 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2024-05-02 16:52 UTC (permalink / raw
To: gentoo-commits
commit: ef43d23b34a5cc2e95c07a86d9161ced261d4c94
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May 2 16:24:44 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu May 2 16:24:44 2024 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=ef43d23b
Version 1.18 released
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ChangeLog | 2 ++
emacs-updater | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 702a3de..372c88b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2024-05-02 Ulrich Müller <ulm@gentoo.org>
+ * Version 1.18 released.
+
* emacs-updater (OPTIONS): Drop the -n, --nocolor, --nocolour
option, which is deprecated since version 1.11 released in 2013.
diff --git a/emacs-updater b/emacs-updater
index 4c4dc8a..2936b64 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -6,7 +6,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Müller <ulm@gentoo.org>
-VERSION=1.17
+VERSION=1.18
EMACS=/usr/bin/emacs
GETOPT=/usr/bin/getopt
SITELISP=/usr/share/emacs/site-lisp
@@ -71,7 +71,7 @@ usage() {
version() {
cat <<-EOF
Emacs updater version ${VERSION}
- Copyright 2007-2023 Gentoo Authors
+ Copyright 2007-2024 Gentoo Authors
Distributed under the terms of the GNU GPL version 2 or later.
Gentoo Emacs project: <https://wiki.gentoo.org/wiki/Project:Emacs>
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2024-05-02 16:52 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2024-05-02 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 9d4c7c5b1bccd719decad755537fafc457fd4cfc
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May 2 16:21:20 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu May 2 16:21:20 2024 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=9d4c7c5b
Drop the -n, --nocolor, --nocolour option
* emacs-updater (OPTIONS): Drop the -n, --nocolor, --nocolour
option, which is deprecated since version 1.11 released in 2013.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ChangeLog | 3 +++
emacs-updater | 7 +++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6323e0c..702a3de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2024-05-02 Ulrich Müller <ulm@gentoo.org>
+ * emacs-updater (OPTIONS): Drop the -n, --nocolor, --nocolour
+ option, which is deprecated since version 1.11 released in 2013.
+
* emacs-updater (COLOUR): Respect the NO_COLOR environment
variable.
diff --git a/emacs-updater b/emacs-updater
index 34fd89b..4c4dc8a 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -107,9 +107,9 @@ pm_auto() {
}
# Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C "${GETOPT}" -o a:behmnopP: \
- --long action:,batch,color::,colour::,nocolor,nocolour,exact,help,major \
- --long orphans,pretend,package-manager:,package-manager-command:,version \
+OPTIONS=$(LC_ALL=C "${GETOPT}" -o a:behmopP: \
+ --long action:,batch,color::,colour::,exact,help,major,orphans \
+ --long pretend,package-manager:,package-manager-command:,version \
-n 'emacs-updater' -- "$@") \
|| usage $?
@@ -137,7 +137,6 @@ do
esac
shift 2
;;
- -n|--nocolor|--nocolour) COLOUR="no"; shift ;; # legacy option
-a|--action)
ACTIONS=
for action in ${2/,/ }; do
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2023-09-25 18:54 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2023-09-25 18:54 UTC (permalink / raw
To: gentoo-commits
commit: 153f84cda8a0cc065c7c8bcedec5efd165d37cf9
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 18:51:54 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 18:51:54 2023 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=153f84cd
Version 1.17 released
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ChangeLog | 2 ++
emacs-updater | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f21d36f..f4e8a2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2023-09-25 Ulrich Müller <ulm@gentoo.org>
+ * Version 1.17 released.
+
* emacs-updater: The -e,--exact option of qfile no longer works in
portage-utils-0.80 or later. The "exact package" functionality is
now available with the -v,--verbose option (--verbose --quiet
diff --git a/emacs-updater b/emacs-updater
index 3cf85b0..6d03c34 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -6,7 +6,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Müller <ulm@gentoo.org>
-VERSION=1.16
+VERSION=1.17
EMACS=/usr/bin/emacs
GETOPT=/usr/bin/getopt
SITELISP=/usr/share/emacs/site-lisp
@@ -69,7 +69,7 @@ usage() {
version() {
cat <<-EOF
Emacs updater version ${VERSION}
- Copyright 2007-2019 Gentoo Authors
+ Copyright 2007-2023 Gentoo Authors
Distributed under the terms of the GNU GPL version 2 or later.
Gentoo Emacs project: <https://wiki.gentoo.org/wiki/Project:Emacs>
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2023-09-25 18:47 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2023-09-25 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 58c7c3ee49dd1987c8542d709340e1315180df86
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 18:45:47 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 18:45:47 2023 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=58c7c3ee
qfile has lost its -e option
* emacs-updater: The -e,--exact option of qfile no longer works in
portage-utils-0.80 or later. The "exact package" functionality is
now available with the -v,--verbose option (--verbose --quiet
looks strange, but is not a contradiction here). Fixes bug 914479.
Bug: https://bugs.gentoo.org/914479
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ChangeLog | 7 +++++++
emacs-updater | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a5da7ab..f21d36f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-09-25 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs-updater: The -e,--exact option of qfile no longer works in
+ portage-utils-0.80 or later. The "exact package" functionality is
+ now available with the -v,--verbose option (--verbose --quiet
+ looks strange, but is not a contradiction here). Fixes bug 914479.
+
2019-08-30 Ulrich Müller <ulm@gentoo.org>
* Version 1.16 released.
diff --git a/emacs-updater b/emacs-updater
index ce308e5..3cf85b0 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2007-2019 Gentoo Authors
+# Copyright 2007-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 or later
# Authors:
@@ -292,7 +292,7 @@ message "Assigning ${NO_OF_FILES} file${s} to packages ..."
if [[ ${ORPHANS} ]]; then
xargs qfile -oCR <"${TMPFILE}" | sort -u >"${PKGFILE}"
elif [[ ${EXACT} ]]; then
- xargs qfile -eqCR <"${TMPFILE}" | sort -u | sed 's/^/=/' >"${PKGFILE}"
+ xargs qfile -vqCR <"${TMPFILE}" | sort -u | sed 's/^/=/' >"${PKGFILE}"
else
# Get package and slot number, requires >=portage-utils-0.3
xargs qfile -SqCR <"${TMPFILE}" | sort -u >"${PKGFILE}"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2019-08-30 22:02 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2019-08-30 22:02 UTC (permalink / raw
To: gentoo-commits
commit: e67308394f12801aae8b004f2753a55c26f59635
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 21:49:01 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 21:49:01 2019 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=e6730839
Fix version comparison for Emacs 26.1 and later.
* emacs-updater (action_rebuild): Drop the last component,
i.e., the build number, from Emacs versions below 26 only.
Bug: https://bugs.gentoo.org/693140
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ChangeLog | 6 ++++++
emacs-updater | 5 ++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 45a594e..25f549d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-08-30 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs-updater (action_rebuild): Drop the last component,
+ i.e., the build number, from Emacs versions below 26 only.
+ Fixes bug 693140.
+
2016-06-08 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: Update URLs to use https.
diff --git a/emacs-updater b/emacs-updater
index 3133316..0bca953 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -237,6 +237,8 @@ action_rebuild() {
ret=$?
[[ ${ret} -eq 0 ]] || { failure "Error running Emacs"; exit ${ret}; }
[[ ${active} ]] || { failure "Cannot determine Emacs version"; exit 1; }
+ # Drop last component (build number) from versions below 26
+ [[ ${active%%.*} -lt 26 ]] && active=${active%.*}
message "Currently selected GNU Emacs version: ${active}"
for elc in $(find "${ROOT}${SITELISP}" -name "*.elc")
@@ -245,8 +247,9 @@ action_rebuild() {
ret=$?
[[ ${ret} -eq 0 ]] || { failure "Error running sed"; exit ${ret}; }
version=${version:-unknown}
+ [[ ${version%%.*} -lt 26 ]] && version=${version%.*}
- if [[ -z ${MAJOR} && ${version%.*} != "${active%.*}" ]] \
+ if [[ -z ${MAJOR} && ${version} != "${active}" ]] \
|| [[ ${version%%.*} != "${active%%.*}" ]] \
|| [[ $1 = all ]]
then
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2019-08-30 22:02 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2019-08-30 22:02 UTC (permalink / raw
To: gentoo-commits
commit: f8aae8b612036972619dc5daaaa6675843b887ab
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 21:53:03 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 21:53:03 2019 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=f8aae8b6
Version 1.16 released.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ChangeLog | 2 ++
emacs-updater | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 25f549d..a5da7ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2019-08-30 Ulrich Müller <ulm@gentoo.org>
+ * Version 1.16 released.
+
* emacs-updater (action_rebuild): Drop the last component,
i.e., the build number, from Emacs versions below 26 only.
Fixes bug 693140.
diff --git a/emacs-updater b/emacs-updater
index 0bca953..ce308e5 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,12 +1,12 @@
#!/bin/bash
-# Copyright 2007-2016 Gentoo Authors
+# Copyright 2007-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 or later
# Authors:
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Müller <ulm@gentoo.org>
-VERSION=1.15
+VERSION=1.16
EMACS=/usr/bin/emacs
GETOPT=/usr/bin/getopt
SITELISP=/usr/share/emacs/site-lisp
@@ -69,7 +69,7 @@ usage() {
version() {
cat <<-EOF
Emacs updater version ${VERSION}
- Copyright 2007-2016 Gentoo Authors
+ Copyright 2007-2019 Gentoo Authors
Distributed under the terms of the GNU GPL version 2 or later.
Gentoo Emacs project: <https://wiki.gentoo.org/wiki/Project:Emacs>
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2018-12-09 22:37 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2018-12-09 22:37 UTC (permalink / raw
To: gentoo-commits
commit: 5e8752b3f7f694668bdd9f1ce53ae7d122e7d956
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 9 22:32:47 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 9 22:32:47 2018 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=5e8752b3
Use simplified copyright notice for GLEP 76 compliance.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Makefile | 2 +-
emacs-updater | 5 ++---
emacs-updater.8 | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 4b88716..ddaa32e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2008-2016 Christian Faulhammer and Ulrich Müller
+# Copyright 2008-2016 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 or later
PN = emacs-updater
diff --git a/emacs-updater b/emacs-updater
index 704d667..3133316 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,6 +1,5 @@
#!/bin/bash
-# Copyright 2007-2010 Christian Faulhammer
-# Copyright 2007-2016 Ulrich Müller
+# Copyright 2007-2016 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 or later
# Authors:
@@ -70,7 +69,7 @@ usage() {
version() {
cat <<-EOF
Emacs updater version ${VERSION}
- Copyright 2007-2016 Christian Faulhammer and Ulrich Müller
+ Copyright 2007-2016 Gentoo Authors
Distributed under the terms of the GNU GPL version 2 or later.
Gentoo Emacs project: <https://wiki.gentoo.org/wiki/Project:Emacs>
diff --git a/emacs-updater.8 b/emacs-updater.8
index 22ecf5b..88777a7 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,5 +1,5 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2008-2016 Ulrich Müller
+.\" Copyright 2008-2016 Gentoo Authors
.\" Distributed under the terms of the GNU General Public License v2 or later
.\"
.TH emacs-updater 8 "May 2014" "Gentoo Linux"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2018-09-16 14:50 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2018-09-16 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 4dd4b3fc65f8d90d4785d0007959edf35213b812
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 14:45:03 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 14:45:03 2018 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=4dd4b3fc
Update copyright notices to follow the new policy.
ChangeLog | 1 -
Makefile | 2 +-
emacs-updater | 5 +++--
emacs-updater.8 | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c759036..45a594e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -362,5 +362,4 @@
* emacs-updater.sh: first version of Emacs updater
-Copyright 2007-2016 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2 or later
diff --git a/Makefile b/Makefile
index 63e02ca..4b88716 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2008-2016 Gentoo Foundation
+# Copyright 2008-2016 Christian Faulhammer and Ulrich Müller
# Distributed under the terms of the GNU General Public License v2 or later
PN = emacs-updater
diff --git a/emacs-updater b/emacs-updater
index 31cc448..704d667 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,6 @@
#!/bin/bash
-# Copyright 2007-2016 Gentoo Foundation
+# Copyright 2007-2010 Christian Faulhammer
+# Copyright 2007-2016 Ulrich Müller
# Distributed under the terms of the GNU General Public License v2 or later
# Authors:
@@ -69,7 +70,7 @@ usage() {
version() {
cat <<-EOF
Emacs updater version ${VERSION}
- Copyright 2007-2016 Gentoo Foundation.
+ Copyright 2007-2016 Christian Faulhammer and Ulrich Müller
Distributed under the terms of the GNU GPL version 2 or later.
Gentoo Emacs project: <https://wiki.gentoo.org/wiki/Project:Emacs>
diff --git a/emacs-updater.8 b/emacs-updater.8
index 0e234b0..22ecf5b 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,5 +1,5 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2008-2016 Gentoo Foundation
+.\" Copyright 2008-2016 Ulrich Müller
.\" Distributed under the terms of the GNU General Public License v2 or later
.\"
.TH emacs-updater 8 "May 2014" "Gentoo Linux"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2016-06-08 6:53 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2016-06-08 6:53 UTC (permalink / raw
To: gentoo-commits
commit: 09086af284adac010b93c759b69b7b9994f4c6ad
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 8 06:52:55 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 8 06:52:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=09086af2
Update URLs.
* emacs-updater: Update URLs to use https.
ChangeLog | 4 ++++
emacs-updater | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 57a87cd..c759036 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-08 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs-updater: Update URLs to use https.
+
2016-06-07 Ulrich Müller <ulm@gentoo.org>
* Version 1.15 released.
diff --git a/emacs-updater b/emacs-updater
index eb822bd..31cc448 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -72,7 +72,7 @@ version() {
Copyright 2007-2016 Gentoo Foundation.
Distributed under the terms of the GNU GPL version 2 or later.
- Gentoo Emacs project: <http://wiki.gentoo.org/wiki/Project:Emacs>
+ Gentoo Emacs project: <https://wiki.gentoo.org/wiki/Project:Emacs>
EOF
exit
}
@@ -334,6 +334,6 @@ ${PM_COMMAND} "${PM_EXTRAOPTS[@]}" $(<"${PKGFILE}")
ret=$?
warning "If a package is being rebuilt over and over again,"
-warning "please report it on http://bugs.gentoo.org/"
+warning "please report it on https://bugs.gentoo.org/"
exit ${ret}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2016-06-07 22:20 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2016-06-07 22:20 UTC (permalink / raw
To: gentoo-commits
commit: 1244518533e2bf8aa4fdfd53cc41d56422085afc
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 16:51:13 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 16:51:13 2016 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=12445185
Version 1.15 released.
ChangeLog | 2 ++
emacs-updater | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 8954223..57a87cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2016-06-07 Ulrich Müller <ulm@gentoo.org>
+ * Version 1.15 released.
+
* emacs-updater: Run qfile under xargs since portage-utils-0.61
has lost the -f option. Fixes bug 584984. Enable the pipefail
option in bash, in order to check qfile's exit status.
diff --git a/emacs-updater b/emacs-updater
index 936e97c..eb822bd 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -6,7 +6,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Müller <ulm@gentoo.org>
-VERSION=1.14
+VERSION=1.15
EMACS=/usr/bin/emacs
GETOPT=/usr/bin/getopt
SITELISP=/usr/share/emacs/site-lisp
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2016-06-07 13:06 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2016-06-07 13:06 UTC (permalink / raw
To: gentoo-commits
commit: f98d6c933ecdac4dd640085500914e8791292543
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 13:06:01 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 13:06:01 2016 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=f98d6c93
More precise wording for error message.
emacs-updater | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/emacs-updater b/emacs-updater
index 361817b..936e97c 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -296,7 +296,7 @@ else
fi
ret=$?
-[[ ${ret} -eq 0 ]] || { failure "Error running qfile"; exit ${ret}; }
+[[ ${ret} -eq 0 ]] || { failure "Error running qfile pipeline"; exit ${ret}; }
NO_OF_PACKAGES=$(wc -l <"${PKGFILE}")
[[ ${NO_OF_PACKAGES} -eq 1 ]] && s= || s=s
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2016-06-07 12:50 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2016-06-07 12:50 UTC (permalink / raw
To: gentoo-commits
commit: d172dd77add5e1328c26c49c86ce79696daeee39
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 12:24:34 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 12:24:34 2016 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=d172dd77
Update copyright year.
ChangeLog | 2 +-
Makefile | 2 +-
emacs-updater | 4 ++--
emacs-updater.8 | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3487baa..7f8124d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -350,5 +350,5 @@
* emacs-updater.sh: first version of Emacs updater
-Copyright 2007-2014 Gentoo Foundation
+Copyright 2007-2016 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2 or later
diff --git a/Makefile b/Makefile
index ee33910..63e02ca 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2008-2014 Gentoo Foundation
+# Copyright 2008-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
PN = emacs-updater
diff --git a/emacs-updater b/emacs-updater
index a5a7c34..8d33bae 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2007-2014 Gentoo Foundation
+# Copyright 2007-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
# Authors:
@@ -69,7 +69,7 @@ usage() {
version() {
cat <<-EOF
Emacs updater version ${VERSION}
- Copyright 2007-2014 Gentoo Foundation.
+ Copyright 2007-2016 Gentoo Foundation.
Distributed under the terms of the GNU GPL version 2 or later.
Gentoo Emacs project: <http://wiki.gentoo.org/wiki/Project:Emacs>
diff --git a/emacs-updater.8 b/emacs-updater.8
index 4c51281..0e234b0 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,5 +1,5 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2008-2014 Gentoo Foundation
+.\" Copyright 2008-2016 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2 or later
.\"
.TH emacs-updater 8 "May 2014" "Gentoo Linux"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2016-06-07 12:50 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2016-06-07 12:50 UTC (permalink / raw
To: gentoo-commits
commit: e58107167fffbe1d0e4c0560b8be5a9d28c5c55d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 12:34:14 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 12:34:14 2016 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=e5810716
Run qfile under xargs since it has lost the -f option.
* emacs-updater: Run qfile under xargs since portage-utils-0.61
has lost the -f option. Fixes bug 584984. Enable the pipefail
option in bash, in order to check qfile's exit status.
ChangeLog | 6 ++++++
emacs-updater | 10 +++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7f8124d..8954223 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-07 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs-updater: Run qfile under xargs since portage-utils-0.61
+ has lost the -f option. Fixes bug 584984. Enable the pipefail
+ option in bash, in order to check qfile's exit status.
+
2014-06-05 Ulrich Müller <ulm@gentoo.org>
* Version 1.14 released.
diff --git a/emacs-updater b/emacs-updater
index 8d33bae..361817b 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -268,6 +268,7 @@ cleanup() {
}
trap cleanup EXIT
+set -o pipefail
TMPFILE="$(mktemp ${TMPDIR:-/tmp}/emacs-updater.files.XXXXXX)"
PKGFILE="$(mktemp ${TMPDIR:-/tmp}/emacs-updater.pkgs.XXXXXX)"
@@ -286,14 +287,17 @@ NO_OF_FILES=$(wc -l <"${TMPFILE}")
message "Assigning ${NO_OF_FILES} file${s} to packages ..."
if [[ ${ORPHANS} ]]; then
- qfile -oCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
+ xargs qfile -oCR <"${TMPFILE}" | sort -u >"${PKGFILE}"
elif [[ ${EXACT} ]]; then
- qfile -eqCR -f "${TMPFILE}" | sort -u | sed 's/^/=/' > "${PKGFILE}"
+ xargs qfile -eqCR <"${TMPFILE}" | sort -u | sed 's/^/=/' >"${PKGFILE}"
else
# Get package and slot number, requires >=portage-utils-0.3
- qfile -SqCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
+ xargs qfile -SqCR <"${TMPFILE}" | sort -u >"${PKGFILE}"
fi
+ret=$?
+[[ ${ret} -eq 0 ]] || { failure "Error running qfile"; exit ${ret}; }
+
NO_OF_PACKAGES=$(wc -l <"${PKGFILE}")
[[ ${NO_OF_PACKAGES} -eq 1 ]] && s= || s=s
if [[ ${ORPHANS} ]]; then
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2014-06-05 17:07 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2014-06-05 17:07 UTC (permalink / raw
To: gentoo-commits
commit: bccab10154e8472554b65d821b60ea4cc2c405dc
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 5 17:02:46 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 5 17:02:46 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=bccab101
Version 1.14 released.
---
ChangeLog | 2 ++
emacs-updater | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 642741f..3487baa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2014-06-05 Ulrich Müller <ulm@gentoo.org>
+ * Version 1.14 released.
+
* emacs-updater (GETOPT): New variable, path of getopt executable.
2014-05-19 Ulrich Müller <ulm@gentoo.org>
diff --git a/emacs-updater b/emacs-updater
index 38c6390..a5a7c34 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -6,7 +6,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Müller <ulm@gentoo.org>
-VERSION=1.13
+VERSION=1.14
EMACS=/usr/bin/emacs
GETOPT=/usr/bin/getopt
SITELISP=/usr/share/emacs/site-lisp
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2014-06-05 16:43 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2014-06-05 16:43 UTC (permalink / raw
To: gentoo-commits
commit: 90485bb12fd5ff2b0a01baaedd371e794b778535
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 5 16:43:04 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 5 16:43:04 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=90485bb1
New variable for path of getopt.
* emacs-updater (GETOPT): New variable, path of getopt executable.
---
ChangeLog | 4 ++++
emacs-updater | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 86d9d16..642741f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-05 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs-updater (GETOPT): New variable, path of getopt executable.
+
2014-05-19 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: Remove the sitedir action; site-init files are
diff --git a/emacs-updater b/emacs-updater
index 7b8a965..38c6390 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -8,6 +8,7 @@
VERSION=1.13
EMACS=/usr/bin/emacs
+GETOPT=/usr/bin/getopt
SITELISP=/usr/share/emacs/site-lisp
# Default actions
@@ -104,7 +105,7 @@ pm_auto() {
}
# Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C getopt -o a:behmnopP: \
+OPTIONS=$(LC_ALL=C "${GETOPT}" -o a:behmnopP: \
--long action:,batch,color::,colour::,nocolor,nocolour,exact,help,major \
--long orphans,pretend,package-manager:,package-manager-command:,version \
-n 'emacs-updater' -- "$@") \
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2014-05-20 6:49 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2014-05-20 6:49 UTC (permalink / raw
To: gentoo-commits
commit: 56d49cfa2a76d59cac6a4925e10506bafa627695
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May 20 06:49:12 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May 20 06:49:12 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=56d49cfa
Do not mention "wrong location" in description.
---
emacs-updater | 4 ++--
emacs-updater.8 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/emacs-updater b/emacs-updater
index 3971de0..7b8a965 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -28,8 +28,8 @@ PRETEND=
usage() {
sed -e 's/^X//' <<-EOF
Usage: ${0##*/} [OPTION]...
- Rebuild Emacs packages that were compiled by another Emacs version,
- or that are installed in the wrong location.
+ Rebuild Emacs packages that were compiled by a different GNU Emacs
+ version, or all Emacs packages.
X
X -a, --action=ACTION[,ACTION]...
X specify actions, comma-separated list of:
diff --git a/emacs-updater.8 b/emacs-updater.8
index f6a5ae3..4c51281 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -9,8 +9,8 @@ emacs-updater \- rebuild Emacs packages
.B emacs-updater
.I [OPTION]...
.SH DESCRIPTION
-Find packages that are installed in the wrong location or rebuild all
-GNU Emacs packages.
+Rebuild Emacs packages that were compiled by a different GNU Emacs
+version, or all Emacs packages.
.SH OPTIONS
.TP
.BI "-a, --action=" ACTION[,ACTION]...
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2014-05-19 18:14 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2014-05-19 18:14 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2014-05-19 18:14 Ulrich Müller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Müller @ 2014-05-19 18:14 UTC (permalink / raw
To: gentoo-commits
commit: f5faae2c922771cc79b1dc3ce3535d3314a49c7e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 19 17:43:06 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 19 17:43:06 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f5faae2c
Update copyright year.
---
ChangeLog | 2 +-
Makefile | 2 +-
emacs-updater | 4 ++--
emacs-updater.8 | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d5aa0d0..a00d5a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -336,5 +336,5 @@
* emacs-updater.sh: first version of Emacs updater
-Copyright 2007-2013 Gentoo Foundation
+Copyright 2007-2014 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2 or later
diff --git a/Makefile b/Makefile
index 0f8172c..ee33910 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2008-2013 Gentoo Foundation
+# Copyright 2008-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
PN = emacs-updater
diff --git a/emacs-updater b/emacs-updater
index c2493bd..4eb9c85 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2007-2013 Gentoo Foundation
+# Copyright 2007-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
# Authors:
@@ -70,7 +70,7 @@ usage() {
version() {
cat <<-EOF
Emacs updater version ${VERSION}
- Copyright 2007-2013 Gentoo Foundation.
+ Copyright 2007-2014 Gentoo Foundation.
Distributed under the terms of the GNU GPL version 2 or later.
Gentoo Emacs project: <http://wiki.gentoo.org/wiki/Project:Emacs>
diff --git a/emacs-updater.8 b/emacs-updater.8
index a5dc998..e2ed0e2 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,8 +1,8 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2008-2013 Gentoo Foundation
+.\" Copyright 2008-2014 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2 or later
.\"
-.TH emacs-updater 8 "March 2013" "Gentoo Linux"
+.TH emacs-updater 8 "May 2014" "Gentoo Linux"
.SH NAME
emacs-updater \- rebuild Emacs packages
.SH SYNOPSIS
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-08-09 13:57 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-08-09 13:57 UTC (permalink / raw
To: gentoo-commits
commit: c04c30b762f2109b91321bca56e0751131aace44
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 9 13:58:21 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 9 13:58:21 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=c04c30b7
Update URI of Emacs project page.
* emacs-updater (version): Update URI of Emacs project page.
---
ChangeLog | 4 ++++
emacs-updater | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 39ccf05..d5aa0d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-09 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs-updater (version): Update URI of Emacs project page.
+
2013-03-20 Ulrich Müller <ulm@gentoo.org>
* Version 1.13 released.
diff --git a/emacs-updater b/emacs-updater
index f2c3573..c2493bd 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -73,7 +73,7 @@ version() {
Copyright 2007-2013 Gentoo Foundation.
Distributed under the terms of the GNU GPL version 2 or later.
- Gentoo Emacs project: <http://www.gentoo.org/proj/en/lisp/emacs/>
+ Gentoo Emacs project: <http://wiki.gentoo.org/wiki/Project:Emacs>
EOF
exit
}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-03-20 17:03 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-03-20 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 6ca64a8e6cc1bb969d638a49067e6412287c9676
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 16:58:38 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 16:58:38 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=6ca64a8e
Version 1.13 released.
---
ChangeLog | 4 ++++
emacs-updater | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6fa2379..39ccf05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-20 Ulrich Müller <ulm@gentoo.org>
+
+ * Version 1.13 released.
+
2013-03-12 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: Exit with status 0 on success, 1 (or status of
diff --git a/emacs-updater b/emacs-updater
index 6aa0d27..f2c3573 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -6,7 +6,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Müller <ulm@gentoo.org>
-VERSION=1.12
+VERSION=1.13
EMACS=/usr/bin/emacs
SITELISP=/usr/share/emacs/site-lisp
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-03-20 16:54 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-03-20 16:54 UTC (permalink / raw
To: gentoo-commits
commit: 1a6fea1a3636b8df98301f668155bbc6b6c526c3
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 16:45:36 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 16:45:36 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1a6fea1a
Minor reformatting of help text.
---
emacs-updater | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/emacs-updater b/emacs-updater
index b97e295..6aa0d27 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -32,37 +32,37 @@ usage() {
or that are installed in the wrong location.
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 -b, --batch batch mode, don't ask any questions
+ 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 -b, --batch batch mode, don't ask any questions
X --color[=MODE], --colour[=MODE]
- X control colour output. MODE is 'yes', 'no',
- X or 'auto'. For 'auto', colour is enabled
- X if standard output is to a terminal
- X (default: auto)
- X -e, --exact match exact versions when remerging packages
- X -m, --major use only the major version when comparing
- X Emacs version numbers
- X -o, --orphans list orphan files (implies '--action all')
- X -p, --pretend don't actually emerge packages
+ X control colour output. MODE is yes, no,
+ X or auto. For 'auto', colour is enabled if
+ X standard output is to a terminal
+ X (default: auto)
+ X -e, --exact match exact versions when remerging packages
+ X -m, --major use only the major version when comparing
+ X Emacs version numbers
+ X -o, --orphans list orphan files (implies '--action all')
+ X -p, --pretend don't actually emerge packages
X -P, --package-manager=PM
- X select a package manager. PM is one out of
- X 'portage', 'pkgcore', or 'paludis'
- X (default: automatically determined)
+ X select a package manager. PM is one out of
+ X portage, pkgcore, or paludis
+ X (default: automatically determined)
X --package-manager-command=CMD
- X call CMD instead of the default package
- X manager command. If CMD includes options
- X the whole command string must be quoted
- X -h, --help display this help and exit
- X --version output version information and exit
+ X call CMD instead of the default package
+ X manager command. If CMD includes options,
+ X the whole command string must be quoted
+ X -h, --help display this help and exit
+ X --version output version information and exit
X
- X -- OPTION... Pass additional options to package manager
+ X -- OPTION... pass additional options to package manager
EOF
exit $1
}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-03-12 18:55 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-03-12 18:55 UTC (permalink / raw
To: gentoo-commits
commit: 3601dbbe901c28a319e85aefa97cdaa547429a17
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 18:45:30 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 18:53:30 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=3601dbbe
Exit with nonzero status only on failure.
* emacs-updater: Exit with status 0 on success, 1 (or status of
last command) on failure.
---
ChangeLog | 5 +++++
emacs-updater | 38 ++++++++++++++++++++++----------------
2 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a93ea5d..91e7afa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-12 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs-updater: Exit with status 0 on success, 1 (or status of
+ last command) on failure.
+
2013-03-11 Ulrich Müller <ulm@gentoo.org>
* Version 1.12 released.
diff --git a/emacs-updater b/emacs-updater
index 5fee9f3..91f42e7 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -109,8 +109,8 @@ pm_auto() {
OPTIONS=$(LC_ALL=C getopt -o a:behmnopP: \
--long action:,batch,color::,colour::,nocolor,nocolour,exact,help,major \
--long orphans,pretend,package-manager:,package-manager-command:,version \
- -n 'emacs-updater' -- "$@")
-[ $? -eq 0 ] || usage 1
+ -n 'emacs-updater' -- "$@") \
+ || usage $?
eval set -- "${OPTIONS}"
@@ -131,7 +131,7 @@ do
auto|tty|if-tty) COLOUR="" ;;
*)
echo "Invalid argument for '$1' option"
- usage 20
+ usage 1
;;
esac
shift 2
@@ -146,7 +146,7 @@ do
;;
*)
echo "Invalid action '$action' given!"
- usage 20
+ usage 1
;;
esac
done
@@ -158,13 +158,13 @@ do
portage|pkgcore|paludis)
if ! have_$2; then
echo "Package manager '$2' not found!"
- exit 22
+ exit 1
fi
PM_COMMAND=pm_$2
;;
*)
echo "Package manager '$2' not known!"
- usage 21
+ usage 1
;;
esac
shift 2
@@ -175,7 +175,7 @@ do
if [[ $# -gt 0 && ${1#-} = $1 ]]; then
# first parameter after -- should be an option
echo "Non-option parameter '$1' for package manager specified!"
- usage 22
+ usage 1
fi
PM_EXTRAOPTS=( "$@" )
break
@@ -183,7 +183,7 @@ do
*)
# this should not happen; getopt should return bad status
echo "Invalid option '$1' given!"
- usage 22
+ usage 1
;;
esac
done
@@ -219,8 +219,7 @@ failure() {
}
emacs_version() {
- "${EMACS}" -batch -q --no-site-file --eval "(princ emacs-version)" \
- || { failure "Cannot run Emacs"; exit 5; }
+ "${EMACS}" -batch -q --no-site-file --eval "(princ emacs-version)"
}
# Get Emacs version from byte-compiled file
@@ -248,16 +247,20 @@ action_sitedir() {
}
action_rebuild() {
- local active version elc
+ local active version elc ret
message "Searching for byte-compiled elisp files ..."
active=$(emacs_version)
- [ -n "${active}" ] || { failure "Cannot determine Emacs version"; exit 6; }
+ ret=$?
+ [[ ${ret} -eq 0 ]] || { failure "Error running Emacs"; exit ${ret}; }
+ [ -n "${active}" ] || { failure "Cannot determine Emacs version"; exit 1; }
message "Currently selected GNU Emacs version: ${active}"
for elc in $(find "${ROOT}${SITELISP}" -name "*.elc")
do
version=$(bytecomp_version "${elc}")
+ ret=$?
+ [[ ${ret} -eq 0 ]] || { failure "Error running sed"; exit ${ret}; }
version=${version:-unknown}
if [ -z "${MAJOR}" -a "${version%.*}" != "${active%.*}" ] \
@@ -292,7 +295,7 @@ done
if [ ! -s "${TMPFILE}" ]; then
warning "No files to update, quitting."
- exit 3
+ exit 0
fi
NO_OF_FILES=$(wc -l <"${TMPFILE}")
@@ -319,13 +322,13 @@ fi
cat "${PKGFILE}"
if [ "${PRETEND}" -o "${ORPHANS}" ]; then
- exit 4
+ exit 0
fi
echo
if [ "${NO_OF_PACKAGES}" -eq 0 ]; then
warning "No packages to update, quitting."
- exit 3
+ exit 0
fi
if [ "${BATCH}" ]; then
@@ -336,11 +339,14 @@ else
echo
case ${choice} in
y*|Y*|"") ;;
- *) warning "Quitting."; exit 10 ;;
+ *) warning "Quitting."; exit 0 ;;
esac
fi
${PM_COMMAND} "${PM_EXTRAOPTS[@]}" $(<"${PKGFILE}")
+ret=$?
warning "If a package is being rebuilt over and over again,"
warning "please report it on http://bugs.gentoo.org/"
+
+exit ${ret}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-03-12 18:55 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-03-12 18:55 UTC (permalink / raw
To: gentoo-commits
commit: 94670b7c752a2beb8c2aa6a6818b42d372048ff1
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 18:48:11 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 18:53:42 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=94670b7c
Use bash syntax for tests.
* emacs-updater: Use bash syntax for tests throughout.
---
ChangeLog | 2 +-
emacs-updater | 30 +++++++++++++++---------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 91e7afa..6fa2379 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
2013-03-12 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: Exit with status 0 on success, 1 (or status of
- last command) on failure.
+ last command) on failure. Use bash syntax for tests throughout.
2013-03-11 Ulrich Müller <ulm@gentoo.org>
diff --git a/emacs-updater b/emacs-updater
index 91f42e7..b97e295 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -172,7 +172,7 @@ do
--package-manager-command) PM_COMMAND=$2; shift 2 ;;
--)
shift
- if [[ $# -gt 0 && ${1#-} = $1 ]]; then
+ if [[ $# -gt 0 && ${1#-} = "$1" ]]; then
# first parameter after -- should be an option
echo "Non-option parameter '$1' for package manager specified!"
usage 1
@@ -189,7 +189,7 @@ do
done
# Set colours based on the --colour option and output redirection status
-if [ -z "${COLOUR}" -a -t 1 -o "${COLOUR}" = "yes" ]; then
+if [[ -z ${COLOUR} && -t 1 ]] || [[ ${COLOUR} = yes ]]; then
BOLD=$(tput bold)
NORMAL=$(tput sgr0)
RED=$(tput setaf 1)${BOLD}
@@ -253,7 +253,7 @@ action_rebuild() {
active=$(emacs_version)
ret=$?
[[ ${ret} -eq 0 ]] || { failure "Error running Emacs"; exit ${ret}; }
- [ -n "${active}" ] || { failure "Cannot determine Emacs version"; exit 1; }
+ [[ ${active} ]] || { failure "Cannot determine Emacs version"; exit 1; }
message "Currently selected GNU Emacs version: ${active}"
for elc in $(find "${ROOT}${SITELISP}" -name "*.elc")
@@ -263,9 +263,9 @@ action_rebuild() {
[[ ${ret} -eq 0 ]] || { failure "Error running sed"; exit ${ret}; }
version=${version:-unknown}
- if [ -z "${MAJOR}" -a "${version%.*}" != "${active%.*}" ] \
- || [ "${version%%.*}" != "${active%%.*}" ] \
- || [ "$1" = all ]
+ if [[ -z ${MAJOR} && ${version%.*} != "${active%.*}" ]] \
+ || [[ ${version%%.*} != "${active%%.*}" ]] \
+ || [[ $1 = all ]]
then
echo "Found ${elc##*/} (compiled by Emacs ${version})"
echo "${elc}" >> "${TMPFILE}"
@@ -293,18 +293,18 @@ for action in ${ACTIONS}; do
action_${action}
done
-if [ ! -s "${TMPFILE}" ]; then
+if [[ ! -s ${TMPFILE} ]]; then
warning "No files to update, quitting."
exit 0
fi
NO_OF_FILES=$(wc -l <"${TMPFILE}")
-[ "${NO_OF_FILES}" -eq 1 ] && s= || s=s
+[[ ${NO_OF_FILES} -eq 1 ]] && s= || s=s
message "Assigning ${NO_OF_FILES} file${s} to packages ..."
-if [ "${ORPHANS}" ]; then
+if [[ ${ORPHANS} ]]; then
qfile -oCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
-elif [ "${EXACT}" ]; then
+elif [[ ${EXACT} ]]; then
qfile -eqCR -f "${TMPFILE}" | sort -u | sed 's/^/=/' > "${PKGFILE}"
else
# Get package and slot number, requires >=portage-utils-0.3
@@ -312,8 +312,8 @@ else
fi
NO_OF_PACKAGES=$(wc -l <"${PKGFILE}")
-[ "${NO_OF_PACKAGES}" -eq 1 ] && s= || s=s
-if [ "${ORPHANS}" ]; then
+[[ ${NO_OF_PACKAGES} -eq 1 ]] && s= || s=s
+if [[ ${ORPHANS} ]]; then
message "${NO_OF_PACKAGES} orphan file${s} found:"
else
message "${NO_OF_PACKAGES} package${s} to remerge:"
@@ -321,17 +321,17 @@ fi
cat "${PKGFILE}"
-if [ "${PRETEND}" -o "${ORPHANS}" ]; then
+if [[ ${PRETEND} || ${ORPHANS} ]]; then
exit 0
fi
echo
-if [ "${NO_OF_PACKAGES}" -eq 0 ]; then
+if [[ ${NO_OF_PACKAGES} -eq 0 ]]; then
warning "No packages to update, quitting."
exit 0
fi
-if [ "${BATCH}" ]; then
+if [[ ${BATCH} ]]; then
message "Remerging packages ..."
else
echo -n "${BOLD}Remerge packages?${NORMAL} [${GREEN}Yes${NORMAL}/${RED}No${NORMAL}] "
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-03-12 18:55 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-03-12 18:55 UTC (permalink / raw
To: gentoo-commits
commit: 993ef5d30b156eddaabd27b45e5250d228264c2f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 20:43:22 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 20:43:22 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=993ef5d3
Fix typo.
---
emacs-updater | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/emacs-updater b/emacs-updater
index 5aba456..5fee9f3 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -41,7 +41,7 @@ usage() {
X byte-compiled Elisp files
X (default: sitedir,rebuild)
X -b, --batch batch mode, don't ask any questions
- X --color=MODE, --colour=MODE
+ X --color[=MODE], --colour[=MODE]
X control colour output. MODE is 'yes', 'no',
X or 'auto'. For 'auto', colour is enabled
X if standard output is to a terminal
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-03-11 11:27 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-03-11 11:27 UTC (permalink / raw
To: gentoo-commits
commit: 7b389f441377854cb0a9dc57a7b74940d50cf054
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 10:25:49 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 10:25:49 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=7b389f44
Version 1.12 released.
---
ChangeLog | 2 ++
emacs-updater | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5975a1d..a93ea5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2013-03-11 Ulrich Müller <ulm@gentoo.org>
+ * Version 1.12 released.
+
* emacs-updater: Add sanity check for package manager options.
* emacs-updater (OPTIONS): Make argument of the --colour option
diff --git a/emacs-updater b/emacs-updater
index d177f31..5aba456 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -6,7 +6,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Müller <ulm@gentoo.org>
-VERSION=1.11
+VERSION=1.12
EMACS=/usr/bin/emacs
SITELISP=/usr/share/emacs/site-lisp
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-03-11 10:15 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-03-11 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 34f588cff4c96b761e4a5889c15cfa0cbc443829
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 10:19:31 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 10:19:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=34f588cf
Add sanity check for package manager options.
* emacs-updater: Add sanity check for package manager options.
---
ChangeLog | 2 ++
emacs-updater | 11 ++++++++++-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ed45772..5975a1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2013-03-11 Ulrich Müller <ulm@gentoo.org>
+ * emacs-updater: Add sanity check for package manager options.
+
* emacs-updater (OPTIONS): Make argument of the --colour option
optional, for compatibility with ls.
(usage): Update help text.
diff --git a/emacs-updater b/emacs-updater
index fe9e532..d177f31 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -170,7 +170,16 @@ do
shift 2
;;
--package-manager-command) PM_COMMAND=$2; shift 2 ;;
- --) shift; PM_EXTRAOPTS=( "$@" ); break ;;
+ --)
+ shift
+ if [[ $# -gt 0 && ${1#-} = $1 ]]; then
+ # first parameter after -- should be an option
+ echo "Non-option parameter '$1' for package manager specified!"
+ usage 22
+ fi
+ PM_EXTRAOPTS=( "$@" )
+ break
+ ;;
*)
# this should not happen; getopt should return bad status
echo "Invalid option '$1' given!"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-03-11 9:43 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-03-11 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 0c7277c8b1ed178dc16a2cfd558b69e1398c3750
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 09:47:31 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 09:47:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=0c7277c8
Argument of --colour is optional.
* emacs-updater (OPTIONS): Make argument of the --colour option
optional, for compatibility with ls.
(usage): Update help text.
* emacs-updater.8: Update.
---
ChangeLog | 5 +++++
emacs-updater | 12 ++++++------
emacs-updater.8 | 14 +++++++-------
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cfc8003..ed45772 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2013-03-11 Ulrich Müller <ulm@gentoo.org>
+ * emacs-updater (OPTIONS): Make argument of the --colour option
+ optional, for compatibility with ls.
+ (usage): Update help text.
+ * emacs-updater.8: Update.
+
* Version 1.11 released.
2013-03-09 Ulrich Müller <ulm@gentoo.org>
diff --git a/emacs-updater b/emacs-updater
index cccab72..fe9e532 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -31,7 +31,7 @@ usage() {
Rebuild Emacs packages that were compiled by another Emacs version,
or that are installed in the wrong location.
X
- X -a, --action ACTION[,ACTION]...
+ 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
@@ -41,7 +41,7 @@ usage() {
X byte-compiled Elisp files
X (default: sitedir,rebuild)
X -b, --batch batch mode, don't ask any questions
- X --color MODE, --colour=MODE
+ X --color=MODE, --colour=MODE
X control colour output. MODE is 'yes', 'no',
X or 'auto'. For 'auto', colour is enabled
X if standard output is to a terminal
@@ -51,11 +51,11 @@ usage() {
X Emacs version numbers
X -o, --orphans list orphan files (implies '--action all')
X -p, --pretend don't actually emerge packages
- X -P, --package-manager PM
+ X -P, --package-manager=PM
X select a package manager. PM is one out of
X 'portage', 'pkgcore', or 'paludis'
X (default: automatically determined)
- X --package-manager-command CMD
+ X --package-manager-command=CMD
X call CMD instead of the default package
X manager command. If CMD includes options
X the whole command string must be quoted
@@ -107,7 +107,7 @@ pm_auto() {
# Read in all command-line options and force English output
OPTIONS=$(LC_ALL=C getopt -o a:behmnopP: \
- --long action:,batch,color:,colour:,nocolor,nocolour,exact,help,major \
+ --long action:,batch,color::,colour::,nocolor,nocolour,exact,help,major \
--long orphans,pretend,package-manager:,package-manager-command:,version \
-n 'emacs-updater' -- "$@")
[ $? -eq 0 ] || usage 1
@@ -126,7 +126,7 @@ do
-p|--pretend) PRETEND="true"; shift ;;
--color|--colour)
case $2 in
- yes|y|always|force) COLOUR="yes" ;;
+ yes|y|always|force|"") COLOUR="yes" ;;
no|n|never|none) COLOUR="no" ;;
auto|tty|if-tty) COLOUR="" ;;
*)
diff --git a/emacs-updater.8 b/emacs-updater.8
index c534020..a5dc998 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -2,7 +2,7 @@
.\" Copyright 2008-2013 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2 or later
.\"
-.TH emacs-updater 8 "January 2013" "Gentoo Linux"
+.TH emacs-updater 8 "March 2013" "Gentoo Linux"
.SH NAME
emacs-updater \- rebuild Emacs packages
.SH SYNOPSIS
@@ -13,7 +13,7 @@ Find packages that are installed in the wrong location or rebuild all
GNU Emacs packages.
.SH OPTIONS
.TP
-.BI "-a, --action" " ACTION[,ACTION]..."
+.BI "-a, --action=" ACTION[,ACTION]...
Specify actions, comma-separated list of:
.BR sitedir :
@@ -33,9 +33,9 @@ Rebuild all packages that have byte-compiled Elisp files.
.B -b, --batch
Batch mode, don't ask the user any questions.
.TP
-.BI \-\-color= "mode, " \-\-colour= mode
+.BI \-\-color "[=MODE], " \-\-colour [=MODE]
Enable or disable colour output.
-.I mode
+.I MODE
can be
.BR yes ,
.BR no ,
@@ -55,12 +55,12 @@ Use only the major version when comparing Emacs version numbers.
.B -o, --orphans
List orphan files, i.e. files that are not owned by any package.
Implies
-.BR "--action all" .
+.BR --action=all .
.TP
.B -p, --pretend
Don't actually emerge packages.
.TP
-.BI "-P, --package-manager" " PM"
+.BI "-P, --package-manager=" PM
Select a package manager.
.I PM
is one out of
@@ -73,7 +73,7 @@ If the argument
is given, then the package manager is automatically determined.
This is the default.
.TP
-.BI --package-manager-command " CMD"
+.BI --package-manager-command= CMD
Call
.I CMD
instead of the default package manager command.
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-03-11 8:23 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-03-11 8:23 UTC (permalink / raw
To: gentoo-commits
commit: 5e84c7a1272c5f47a2798c0da0e21d0344994cec
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 08:24:02 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 08:24:02 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=5e84c7a1
Version 1.11 released.
---
ChangeLog | 4 ++++
emacs-updater | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1ba2684..cfc8003 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-11 Ulrich Müller <ulm@gentoo.org>
+
+ * Version 1.11 released.
+
2013-03-09 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (OPTIONS): New long option --colour=<yes|no|auto>,
diff --git a/emacs-updater b/emacs-updater
index 68c4ac3..cccab72 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -6,7 +6,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Müller <ulm@gentoo.org>
-VERSION=1.10
+VERSION=1.11
EMACS=/usr/bin/emacs
SITELISP=/usr/share/emacs/site-lisp
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-03-09 12:31 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-03-09 12:31 UTC (permalink / raw
To: gentoo-commits
commit: 46b2a5fa42889c0d63bdf1f2fa94c148527d55c4
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 11:17:44 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 11:17:44 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=46b2a5fa
Update copyright year.
---
ChangeLog | 2 +-
Makefile | 2 +-
emacs-updater | 4 ++--
emacs-updater.8 | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c6219eb..72cb580 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -299,5 +299,5 @@
* emacs-updater.sh: first version of Emacs updater
-Copyright 2007-2012 Gentoo Foundation
+Copyright 2007-2013 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2 or later
diff --git a/Makefile b/Makefile
index 8b5d91f..0f8172c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2008-2012 Gentoo Foundation
+# Copyright 2008-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
PN = emacs-updater
diff --git a/emacs-updater b/emacs-updater
index 4e44616..21329d0 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2007-2012 Gentoo Foundation
+# Copyright 2007-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
# Authors:
@@ -67,7 +67,7 @@ usage() {
version() {
cat <<-EOF
Emacs updater version ${VERSION}
- Copyright 2007-2012 Gentoo Foundation.
+ Copyright 2007-2013 Gentoo Foundation.
Distributed under the terms of the GNU GPL version 2 or later.
Gentoo Emacs project: <http://www.gentoo.org/proj/en/lisp/emacs/>
diff --git a/emacs-updater.8 b/emacs-updater.8
index d1f9cd0..afa9995 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,5 +1,5 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2008-2012 Gentoo Foundation
+.\" Copyright 2008-2013 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2 or later
.\"
.TH emacs-updater 8 "October 2012" "Gentoo Linux"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-03-09 12:31 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-03-09 12:31 UTC (permalink / raw
To: gentoo-commits
commit: c42f31849a70163a7364ed92eca5a2577f7010af
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 12:32:31 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 12:34:54 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=c42f3184
New --colour option.
* emacs-updater (OPTIONS): New long option --colour=<yes|no|auto>,
compatible with the same option in eselect. Spelling --color is
recognised too.
(COLOUR): Variable renamed from NOCOLOUR.
(usage): Update help text.
* emacs-updater.8: Describe --colour option, drop --nocolour.
---
ChangeLog | 7 +++++++
emacs-updater | 32 +++++++++++++++++++++++---------
emacs-updater.8 | 18 ++++++++++++++----
3 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a17828a..1ba2684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2013-03-09 Ulrich Müller <ulm@gentoo.org>
+ * emacs-updater (OPTIONS): New long option --colour=<yes|no|auto>,
+ compatible with the same option in eselect. Spelling --color is
+ recognised too.
+ (COLOUR): Variable renamed from NOCOLOUR.
+ (usage): Update help text.
+ * emacs-updater.8: Describe --colour option, drop --nocolour.
+
* emacs-updater: Remove unneccesary quoting.
2012-10-11 Ulrich Müller <ulm@gentoo.org>
diff --git a/emacs-updater b/emacs-updater
index ac42692..68c4ac3 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -19,9 +19,9 @@ PM_EXTRAOPTS=( )
# Other default variable settings
BATCH=
+COLOUR=
EXACT=
MAJOR=
-NOCOLOUR=
ORPHANS=
PRETEND=
@@ -41,11 +41,14 @@ usage() {
X byte-compiled Elisp files
X (default: sitedir,rebuild)
X -b, --batch batch mode, don't ask any questions
+ X --color MODE, --colour=MODE
+ X control colour output. MODE is 'yes', 'no',
+ X or 'auto'. For 'auto', colour is enabled
+ X if standard output is to a terminal
+ X (default: auto)
X -e, --exact match exact versions when remerging packages
X -m, --major use only the major version when comparing
X Emacs version numbers
- X -n, --nocolour, --nocolor
- X disable colour in output
X -o, --orphans list orphan files (implies '--action all')
X -p, --pretend don't actually emerge packages
X -P, --package-manager PM
@@ -104,8 +107,8 @@ pm_auto() {
# Read in all command-line options and force English output
OPTIONS=$(LC_ALL=C getopt -o a:behmnopP: \
- --long action:,batch,exact,help,major,nocolour,nocolor,orphans,pretend \
- --long package-manager:,package-manager-command:,version \
+ --long action:,batch,color:,colour:,nocolor,nocolour,exact,help,major \
+ --long orphans,pretend,package-manager:,package-manager-command:,version \
-n 'emacs-updater' -- "$@")
[ $? -eq 0 ] || usage 1
@@ -121,7 +124,19 @@ do
-m|--major) MAJOR="true"; shift ;;
-o|--orphans) ORPHANS="true"; ACTIONS="all"; shift ;;
-p|--pretend) PRETEND="true"; shift ;;
- -n|--nocolour|--nocolor) NOCOLOUR="true"; shift ;;
+ --color|--colour)
+ case $2 in
+ yes|y|always|force) COLOUR="yes" ;;
+ no|n|never|none) COLOUR="no" ;;
+ auto|tty|if-tty) COLOUR="" ;;
+ *)
+ echo "Invalid argument for '$1' option"
+ usage 20
+ ;;
+ esac
+ shift 2
+ ;;
+ -n|--nocolor|--nocolour) COLOUR="no"; shift ;; # legacy option
-a|--action)
ACTIONS=
for action in ${2/,/ }; do
@@ -164,9 +179,8 @@ do
esac
done
-# Only set colours if output is not redirected or the --nocolour
-# option is not set
-if [ -t 1 ] && [ -z "${NOCOLOUR}" ] ; then
+# Set colours based on the --colour option and output redirection status
+if [ -z "${COLOUR}" -a -t 1 -o "${COLOUR}" = "yes" ]; then
BOLD=$(tput bold)
NORMAL=$(tput sgr0)
RED=$(tput setaf 1)${BOLD}
diff --git a/emacs-updater.8 b/emacs-updater.8
index afa9995..c534020 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -2,7 +2,7 @@
.\" Copyright 2008-2013 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2 or later
.\"
-.TH emacs-updater 8 "October 2012" "Gentoo Linux"
+.TH emacs-updater 8 "January 2013" "Gentoo Linux"
.SH NAME
emacs-updater \- rebuild Emacs packages
.SH SYNOPSIS
@@ -33,15 +33,25 @@ Rebuild all packages that have byte-compiled Elisp files.
.B -b, --batch
Batch mode, don't ask the user any questions.
.TP
+.BI \-\-color= "mode, " \-\-colour= mode
+Enable or disable colour output.
+.I mode
+can be
+.BR yes ,
+.BR no ,
+or
+.BR auto .
+The default is
+.BR auto ,
+for which colour output is enabled only if standard output is
+connected to a terminal.
+.TP
.B -e, --exact
Match exact versions when remerging packages.
.TP
.B -m, --major
Use only the major version when comparing Emacs version numbers.
.TP
-.B -n, --nocolour, --nocolor
-Disable colour in output.
-.TP
.B -o, --orphans
List orphan files, i.e. files that are not owned by any package.
Implies
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2013-03-09 12:31 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2013-03-09 12:31 UTC (permalink / raw
To: gentoo-commits
commit: e6304fcfd6b0b4fda10289d303b36a7164adf93d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 11:25:15 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 11:25:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=e6304fcf
Remove unneccesary quoting.
* emacs-updater: Remove unneccesary quoting.
---
ChangeLog | 4 ++++
emacs-updater | 26 +++++++++++++-------------
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 72cb580..a17828a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-09 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs-updater: Remove unneccesary quoting.
+
2012-10-11 Ulrich Müller <ulm@gentoo.org>
* Version 1.10 released.
diff --git a/emacs-updater b/emacs-updater
index 21329d0..ac42692 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -61,7 +61,7 @@ usage() {
X
X -- OPTION... Pass additional options to package manager
EOF
- exit ${1}
+ exit $1
}
version() {
@@ -113,7 +113,7 @@ eval set -- "${OPTIONS}"
while true
do
- case "${1}" in
+ case $1 in
-h|--help) usage 0 ;;
--version) version ;;
-b|--batch) BATCH="true"; shift ;;
@@ -125,7 +125,7 @@ do
-a|--action)
ACTIONS=
for action in ${2/,/ }; do
- case "${action}" in
+ case ${action} in
sitedir|rebuild|all)
ACTIONS="${ACTIONS}${ACTIONS:+ }${action}"
;;
@@ -138,27 +138,27 @@ do
shift 2
;;
-P|--package-manager)
- case "${2}" in
+ case $2 in
auto|automatic) PM_COMMAND=pm_auto ;;
portage|pkgcore|paludis)
- if ! have_${2}; then
- echo "Package manager '${2}' not found!"
+ if ! have_$2; then
+ echo "Package manager '$2' not found!"
exit 22
fi
- PM_COMMAND=pm_${2}
+ PM_COMMAND=pm_$2
;;
*)
- echo "Package manager '${2}' not known!"
+ echo "Package manager '$2' not known!"
usage 21
;;
esac
shift 2
;;
- --package-manager-command) PM_COMMAND=${2}; shift 2 ;;
+ --package-manager-command) PM_COMMAND=$2; shift 2 ;;
--) shift; PM_EXTRAOPTS=( "$@" ); break ;;
*)
# this should not happen; getopt should return bad status
- echo "Invalid option '${1}' given!"
+ echo "Invalid option '$1' given!"
usage 22
;;
esac
@@ -202,7 +202,7 @@ emacs_version() {
# Get Emacs version from byte-compiled file
bytecomp_version() {
- sed -n '/^[^;]/q;s/\.$//;s/.*[Ee]macs version \([0-9].*\)/\1/p' "${1}"
+ sed -n '/^[^;]/q;s/\.$//;s/.*[Ee]macs version \([0-9].*\)/\1/p' "$1"
}
action_sitedir() {
@@ -239,7 +239,7 @@ action_rebuild() {
if [ -z "${MAJOR}" -a "${version%.*}" != "${active%.*}" ] \
|| [ "${version%%.*}" != "${active%%.*}" ] \
- || [ "${1}" = all ]
+ || [ "$1" = all ]
then
echo "Found ${elc##*/} (compiled by Emacs ${version})"
echo "${elc}" >> "${TMPFILE}"
@@ -311,7 +311,7 @@ else
echo -n "${BOLD}Remerge packages?${NORMAL} [${GREEN}Yes${NORMAL}/${RED}No${NORMAL}] "
read choice
echo
- case "${choice}" in
+ case ${choice} in
y*|Y*|"") ;;
*) warning "Quitting."; exit 10 ;;
esac
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-10-11 8:20 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2012-10-11 8:20 UTC (permalink / raw
To: gentoo-commits
commit: b15393d762293bb1bba4478fe27d5f3de91e2fef
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 08:18:52 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 08:25:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=b15393d7
Version 1.10 released.
---
ChangeLog | 2 ++
emacs-updater | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9000cd1..c6219eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-10-11 Ulrich Müller <ulm@gentoo.org>
+ * Version 1.10 released.
+
* Makefile (dist): Use xz for compression.
2012-10-08 Ulrich Müller <ulm@gentoo.org>
diff --git a/emacs-updater b/emacs-updater
index 5b1a9a3..4e44616 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -6,7 +6,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Müller <ulm@gentoo.org>
-VERSION=1.9
+VERSION=1.10
EMACS=/usr/bin/emacs
SITELISP=/usr/share/emacs/site-lisp
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-10-11 8:20 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2012-10-11 8:20 UTC (permalink / raw
To: gentoo-commits
commit: f85ae041ef8d87944c2550db7ea25ceb9086d36e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 08:22:30 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 08:23:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f85ae041
Use xz for compression of distfile.
---
ChangeLog | 4 ++++
Makefile | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f06a375..9000cd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-11 Ulrich Müller <ulm@gentoo.org>
+
+ * Makefile (dist): Use xz for compression.
+
2012-10-08 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: Honour slots of installed packages, bug 436350.
diff --git a/Makefile b/Makefile
index 27e4473..8b5d91f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,8 @@ DISTFILES = emacs-updater emacs-updater.8 ChangeLog
all:
dist: $(DISTFILES)
- tar -cjf $(P).tar.bz2 --transform='s%^%$(P)/%' $^
- tar -tjvf $(P).tar.bz2
+ tar -cJf $(P).tar.xz --transform='s%^%$(P)/%' $^
+ tar -tJvf $(P).tar.xz
clean:
- -rm -f *~ *.tmp *.gz *.bz2
+ -rm -f *~ *.tmp *.gz *.bz2 *.xz
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-10-08 20:59 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2012-10-08 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 6dbc317d4131efacf3df5e37e1a713353be5996d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 8 21:08:39 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 8 21:08:39 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=6dbc317d
Update copyright year.
---
ChangeLog | 2 +-
Makefile | 2 +-
emacs-updater | 4 ++--
emacs-updater.8 | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index da48fc5..f06a375 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -293,5 +293,5 @@
* emacs-updater.sh: first version of Emacs updater
-Copyright 2007-2011 Gentoo Foundation
+Copyright 2007-2012 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2 or later
diff --git a/Makefile b/Makefile
index cb90171..27e4473 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Gentoo Foundation
+# Copyright 2008-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
PN = emacs-updater
diff --git a/emacs-updater b/emacs-updater
index c893502..5b1a9a3 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2007-2011 Gentoo Foundation
+# Copyright 2007-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
# Authors:
@@ -67,7 +67,7 @@ usage() {
version() {
cat <<-EOF
Emacs updater version ${VERSION}
- Copyright 2007-2011 Gentoo Foundation.
+ Copyright 2007-2012 Gentoo Foundation.
Distributed under the terms of the GNU GPL version 2 or later.
Gentoo Emacs project: <http://www.gentoo.org/proj/en/lisp/emacs/>
diff --git a/emacs-updater.8 b/emacs-updater.8
index 46d3db5..d1f9cd0 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,8 +1,8 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2008-2011 Gentoo Foundation
+.\" Copyright 2008-2012 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2 or later
.\"
-.TH emacs-updater 8 "August 2011" "Gentoo Linux"
+.TH emacs-updater 8 "October 2012" "Gentoo Linux"
.SH NAME
emacs-updater \- rebuild Emacs packages
.SH SYNOPSIS
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-10-08 20:45 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2012-10-08 20:45 UTC (permalink / raw
To: gentoo-commits
commit: 5eefa6aae03e71620fc71a72d43247efa9135709
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 8 20:54:24 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 8 20:54:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=5eefa6aa
Honour slots of installed packages, bug 436350.
* emacs-updater: Honour slots of installed packages, bug 436350.
This requires qfile supporting the -S option, i.e. version 0.3
or newer of portage-utils.
---
ChangeLog | 6 ++++++
emacs-updater | 5 ++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 98da930..da48fc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-08 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs-updater: Honour slots of installed packages, bug 436350.
+ This requires qfile supporting the -S option, i.e. version 0.3
+ or newer of portage-utils.
+
2011-08-24 Ulrich Müller <ulm@gentoo.org>
* Version 1.9 released.
diff --git a/emacs-updater b/emacs-updater
index ee9a05f..c893502 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -281,9 +281,8 @@ if [ "${ORPHANS}" ]; then
elif [ "${EXACT}" ]; then
qfile -eqCR -f "${TMPFILE}" | sort -u | sed 's/^/=/' > "${PKGFILE}"
else
- qfile -qCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
- # Get package and slot number
- # qfile -eqCR -f "${TMPFILE}" | sort -u | xargs qlist -eqCILS
+ # Get package and slot number, requires >=portage-utils-0.3
+ qfile -SqCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
fi
NO_OF_PACKAGES=$(wc -l <"${PKGFILE}")
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 18:47 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2012-05-06 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 8109bc926e5b7b63b484d96236208e76a0d1f451
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 6 18:27:18 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 6 18:27:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=8109bc92
Drop subversion keywords.
---
ChangeLog | 1 -
Makefile | 1 -
emacs-updater | 1 -
emacs-updater.8 | 1 -
4 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ab828e3..98da930 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -289,4 +289,3 @@
Copyright 2007-2011 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2 or later
-$Id$
diff --git a/Makefile b/Makefile
index 9551584..cb90171 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
# Copyright 2008-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
-# $Id$
PN = emacs-updater
PV = $(shell sed '/^VERSION/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' emacs-updater)
diff --git a/emacs-updater b/emacs-updater
index 6d9a3ac..ee9a05f 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 2007-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
-# $Id$
# Authors:
# Christian Faulhammer <fauli@gentoo.org>
diff --git a/emacs-updater.8 b/emacs-updater.8
index f0617d7..46d3db5 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,7 +1,6 @@
.\" -*- coding: utf-8 -*-
.\" Copyright 2008-2011 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2 or later
-.\" $Id$
.\"
.TH emacs-updater 8 "August 2011" "Gentoo Linux"
.SH NAME
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 18:14 Ulrich Mueller
0 siblings, 0 replies; 66+ messages in thread
From: Ulrich Mueller @ 2012-05-06 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 1570d5f3bc167eb0798f10e96c579244fe9ee7ab
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 6 18:16:54 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 6 18:16:54 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1570d5f3
Allow UTF-8 characters.
---
ChangeLog | 70 ++++++++++++++++++++++++++++----------------------------
emacs-updater | 2 +-
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 34b03a0..ab828e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,16 @@
-2011-08-24 Ulrich Mueller <ulm@gentoo.org>
+2011-08-24 Ulrich Müller <ulm@gentoo.org>
* Version 1.9 released.
* emacs-updater (action_rebuild): When comparing Emacs versions,
ignore the last component, i.e. the local build number.
-2011-04-06 Ulrich Mueller <ulm@gentoo.org>
+2011-04-06 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: With option --orphans, imply --action=all.
* emacs-updater.8: Document it.
-2011-01-05 Ulrich Mueller <ulm@gentoo.org>
+2011-01-05 Ulrich Müller <ulm@gentoo.org>
* Version 1.8 released.
@@ -18,12 +18,12 @@
latter did not work for empty files. Postpone message that no
packages have been found.
-2010-11-27 Ulrich Mueller <ulm@gentoo.org>
+2010-11-27 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (have_paludis, pm_paludis): Use cave instead of
paludis.
-2010-11-09 Ulrich Mueller <ulm@gentoo.org>
+2010-11-09 Ulrich Müller <ulm@gentoo.org>
* Version 1.7 released.
@@ -42,11 +42,11 @@
* emacs-updater (pm_portage): Add --keep-going option for user
convenience
-2009-08-27 Ulrich Mueller <ulm@gentoo.org>
+2009-08-27 Ulrich Müller <ulm@gentoo.org>
* Version 1.6 released.
-2009-08-25 Ulrich Mueller <ulm@gentoo.org>
+2009-08-25 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (OPTIONS): New options --major|-m, --orphans|-o,
and --version.
@@ -55,13 +55,13 @@
(usage): Update help text.
* emacs-updater.8: Describe new options.
-2009-08-09 Ulrich Mueller <ulm@gentoo.org>
+2009-08-09 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (OPTIONS): New option --package-manager-command.
(usage): Update help text.
* emacs-updater.8: Update.
-2009-06-04 Ulrich Mueller <ulm@gentoo.org>
+2009-06-04 Ulrich Müller <ulm@gentoo.org>
* Version 1.5 released.
@@ -69,12 +69,12 @@
from the PACKAGE_MANAGER environment variable first.
* emacs-updater.8: Document it.
-2009-05-24 Ulrich Mueller <ulm@gentoo.org>
+2009-05-24 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (emacs_version, bytecomp_version): Rename, in
order to avoid hyphens in function identifiers.
-2009-04-14 Ulrich Mueller <ulm@gentoo.org>
+2009-04-14 Ulrich Müller <ulm@gentoo.org>
* Version 1.4 released.
@@ -82,13 +82,13 @@
option is also accepted.
* emacs-updater.8: Update.
-2009-04-13 Ulrich Mueller <ulm@gentoo.org>
+2009-04-13 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN):
Change initialisation, since POSIX tput has no -S option.
(bytecomp-version): Use POSIX syntax in sed expression.
-2009-04-11 Ulrich Mueller <ulm@gentoo.org>
+2009-04-11 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (have_portage, have_pkgcore, have_paludis):
New functions, return true if respective package manager exists.
@@ -96,33 +96,33 @@
(PM_COMMAND): Default to pm_auto.
Test if package manager selected by -P option actually exists.
-2009-03-22 Ulrich Mueller <ulm@gentoo.org>
+2009-03-22 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (action_sitedir): 00site-gentoo.el should not
exist any more. Treat it like a normal file.
-2009-01-18 Ulrich Mueller <ulm@gentoo.org>
+2009-01-18 Ulrich Müller <ulm@gentoo.org>
* Version 1.3 released.
-2009-01-09 Ulrich Mueller <ulm@gentoo.org>
+2009-01-09 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (EMACS): New variable, path of Emacs executable.
(emacs-version): Use it.
-2008-12-30 Ulrich Mueller <ulm@gentoo.org>
+2008-12-30 Ulrich Müller <ulm@gentoo.org>
* Version 1.2 released.
-2008-12-19 Ulrich Mueller <ulm@gentoo.org>
+2008-12-19 Ulrich Müller <ulm@gentoo.org>
* emacs-updater.8: Formatting changes. Remove superfluous quotes.
-2008-11-11 Ulrich Mueller <ulm@gentoo.org>
+2008-11-11 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (bytecomp-version): New function.
-2008-11-04 Ulrich Mueller <ulm@gentoo.org>
+2008-11-04 Ulrich Müller <ulm@gentoo.org>
* Version 1.1 released.
@@ -135,34 +135,34 @@
* emacs-updater (TMPFILE, PKGFILE): Respect TMPDIR variable from
environment
-2008-09-18 Ulrich Mueller <ulm@gentoo.org>
+2008-09-18 Ulrich Müller <ulm@gentoo.org>
* emacs-updater.8: New file: man page.
-2008-09-12 Ulrich Mueller <ulm@gentoo.org>
+2008-09-12 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (NOCOLOUR, PRETEND): Assign empty default values.
Likewise for colours.
(OPTIONS, EXACT): Add new --exact|-e option and variable.
(usage): Update.
-2008-09-04 Ulrich Mueller <ulm@gentoo.org>
+2008-09-04 Ulrich Müller <ulm@gentoo.org>
* Version 1.0 released.
-2008-08-30 Ulrich Mueller <ulm@gentoo.org>
+2008-08-30 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (TMPFILE, PKGFILE): Create after the cleanup trap,
to avoid leftover temporary files.
-2008-08-29 Ulrich Mueller <ulm@gentoo.org>
+2008-08-29 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: No need to check for programs since we have
proper dependencies now.
* Makefile: New file.
-2008-08-21 Ulrich Mueller <ulm@gentoo.org>
+2008-08-21 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (action_sitedir, action_rebuild, action_all):
Functions renamed from "obsolete_location", "rebuild", and
@@ -170,14 +170,14 @@
(action_rebuild): Add ROOT and quote properly.
(usage): Update.
-2008-08-19 Ulrich Mueller <ulm@gentoo.org>
+2008-08-19 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: Change syntax of -a option, use comma-separated
list instead of multiple -a options.
(ACTIONS): Change default to "obsolete_location rebuild".
(usage): Update accordingly.
-2008-08-13 Ulrich Mueller <ulm@gentoo.org>
+2008-08-13 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: Support alternative package managers.
(OPTIONS): Add --package-manager|-P option.
@@ -185,7 +185,7 @@
(pm_portage, pm_pkgcore, pm_paludis): New wrapper functions.
(usage): Update help text. Order options alphabetically.
-2008-08-12 Ulrich Mueller <ulm@gentoo.org>
+2008-08-12 Ulrich Müller <ulm@gentoo.org>
* emacs-updater (rebuild): Skip files if they were byte-compiled
by the active Emacs version, unless option "all" is specified.
@@ -206,7 +206,7 @@
* emacs-updater: canonify exit codes and remove some ambiguities
-2008-02-29 Ulrich Mueller <ulm@gentoo.org>
+2008-02-29 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: Check for getopt exit status. Add usage function.
@@ -215,7 +215,7 @@
* emacs-updater: Number of packages that need a remerge is
calculated and displayed
-2008-02-22 Ulrich Mueller <ulm@gentoo.org>
+2008-02-22 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: Use tput instead of hardcoded escape sequences.
Add standard copyright notice. Change version to 0.5.
@@ -227,12 +227,12 @@
Add options: --help|-h, --pretend|-p and --no-colour|-n, which do
what their names suggest
-2007-12-29 Ulrich Mueller <ulm@gentoo.org>
+2007-12-29 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: Remove warning; the eclasses are official now.
Change version to 0.3.
-2007-12-14 Ulrich Mueller <ulm@gentoo.org>
+2007-12-14 Ulrich Müller <ulm@gentoo.org>
* emacs-updater: Use long options for emerge.
Add --oneshot in order to keep the world file tidy.
@@ -245,14 +245,14 @@
* emacs-updater.sh: Add ulm as author
-2007-12-12 Ulrich Mueller <ulm@gentoo.org>
+2007-12-12 Ulrich Müller <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.
Ignore auxiliary file 00site-gentoo.el.
-2007-12-06 Ulrich Mueller <ulm@gentoo.org>
+2007-12-06 Ulrich Müller <ulm@gentoo.org>
* emacs-updater.sh: Test for existence of non-empty temp file;
cat may fail if the file does not exist.
diff --git a/emacs-updater b/emacs-updater
index 76b70cd..6d9a3ac 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -5,7 +5,7 @@
# Authors:
# Christian Faulhammer <fauli@gentoo.org>
-# Ulrich Mueller <ulm@gentoo.org>
+# Ulrich Müller <ulm@gentoo.org>
VERSION=1.9
EMACS=/usr/bin/emacs
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1480 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:06 ` [gentoo-commits] proj/emacs-tools:emacs-updater " Sebastian Pipping
0 siblings, 1 reply; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
To: gentoo-commits
commit: cae11912aa8a0eb2e9d098babb7999344a0512ad
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 19:06:40 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 19:06:40 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=cae11912
End sentences with a full stop.
svn path=/emacs-updater/; revision=1391
---
emacs-updater.8 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/emacs-updater.8 b/emacs-updater.8
index b05fcae..9b32365 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -17,33 +17,33 @@ GNU Emacs packages.
Specify actions, comma-separated list of:
.BR sitedir :
-Find site-init files not in the new-style location
+Find site-init files not in the new-style location.
.BR rebuild :
Rebuild packages with Elisp files byte-compiled by a different Emacs
-version
+version.
.BR all :
-Rebuild all packages that have byte-compiled Elisp files
+Rebuild all packages that have byte-compiled Elisp files.
(default:
.BR sitedir ,
.BR rebuild )
.TP
.B -e, --exact
-Match exact versions when remerging packages
+Match exact versions when remerging packages.
.TP
.B -m, --major
-Use only the major version when comparing Emacs version numbers
+Use only the major version when comparing Emacs version numbers.
.TP
.B -n, --nocolour, --nocolor
-Disable colour in output
+Disable colour in output.
.TP
.B -o, --orphans
List orphan files, i.e. files that are not owned by any package.
.TP
.B -p, --pretend
-Don't actually emerge packages
+Don't actually emerge packages.
.TP
.BI "-P, --package-manager" " PM"
Select a package manager.
@@ -67,10 +67,10 @@ may include options in which case the whole command string must be
passed as a single argument (i.e. included in quotes).
.TP
.B -h, --help
-Display help and exit
+Display help and exit.
.TP
.B --version
-Output version information and exit
+Output version information and exit.
.SH ENVIRONMENT
.TP
.B PACKAGE_MANAGER
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
2012-05-06 16:07 [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1480 " Sebastian Pipping
@ 2012-05-06 16:06 ` Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: cae11912aa8a0eb2e9d098babb7999344a0512ad
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 19:06:40 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 19:06:40 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=cae11912
End sentences with a full stop.
svn path=/emacs-updater/; revision=1391
---
emacs-updater.8 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/emacs-updater.8 b/emacs-updater.8
index b05fcae..9b32365 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -17,33 +17,33 @@ GNU Emacs packages.
Specify actions, comma-separated list of:
.BR sitedir :
-Find site-init files not in the new-style location
+Find site-init files not in the new-style location.
.BR rebuild :
Rebuild packages with Elisp files byte-compiled by a different Emacs
-version
+version.
.BR all :
-Rebuild all packages that have byte-compiled Elisp files
+Rebuild all packages that have byte-compiled Elisp files.
(default:
.BR sitedir ,
.BR rebuild )
.TP
.B -e, --exact
-Match exact versions when remerging packages
+Match exact versions when remerging packages.
.TP
.B -m, --major
-Use only the major version when comparing Emacs version numbers
+Use only the major version when comparing Emacs version numbers.
.TP
.B -n, --nocolour, --nocolor
-Disable colour in output
+Disable colour in output.
.TP
.B -o, --orphans
List orphan files, i.e. files that are not owned by any package.
.TP
.B -p, --pretend
-Don't actually emerge packages
+Don't actually emerge packages.
.TP
.BI "-P, --package-manager" " PM"
Select a package manager.
@@ -67,10 +67,10 @@ may include options in which case the whole command string must be
passed as a single argument (i.e. included in quotes).
.TP
.B -h, --help
-Display help and exit
+Display help and exit.
.TP
.B --version
-Output version information and exit
+Output version information and exit.
.SH ENVIRONMENT
.TP
.B PACKAGE_MANAGER
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1480 commit in: /
@ 2012-05-06 16:07 Sebastian Pipping
2012-05-06 16:06 ` [gentoo-commits] proj/emacs-tools:emacs-updater " Sebastian Pipping
0 siblings, 1 reply; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 1edc608be5cb86ae31eddecb2f6753b0b98db431
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 12:48:59 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 12:48:59 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1edc608b
New --orphans option (and commit forgotten ChangeLog entry for --version).
svn path=/emacs-updater/; revision=1364
---
ChangeLog | 8 ++++++++
emacs-updater | 11 ++++++++---
emacs-updater.8 | 3 +++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2189a14..358e64b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-25 Ulrich Mueller <ulm@gentoo.org>
+
+ * emacs-updater (OPTIONS): New options --orphans|-o and --version.
+ (ORPHANS): New variable.
+ (version): New function.
+ (usage): Update help text.
+ * emacs-updater.8: Describe new options.
+
2009-08-09 Ulrich Mueller <ulm@gentoo.org>
* emacs-updater (OPTIONS): New option --package-manager-command.
diff --git a/emacs-updater b/emacs-updater
index b81ce90..f6d0c5a 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -20,6 +20,7 @@ PM_COMMAND=pm_auto
# Other default variable settings
EXACT=
NOCOLOUR=
+ORPHANS=
PRETEND=
usage() {
@@ -40,6 +41,7 @@ usage() {
X -e, --exact match exact versions when remerging packages
X -n, --nocolour, --nocolor
X disable colour in output
+ X -o, --orphans list orphan files
X -p, --pretend don't actually emerge packages
X -P, --package-manager PM
X select a package manager. PM is one out of
@@ -94,8 +96,8 @@ pm_auto() {
}
# Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C getopt -o a:ehnpP: \
- --long action:,exact,help,nocolour,nocolor,pretend \
+OPTIONS=$(LC_ALL=C getopt -o a:ehnopP: \
+ --long action:,exact,help,nocolour,nocolor,orphans,pretend \
--long package-manager:,package-manager-command:,version \
-n 'emacs-updater' -- "$@")
[ $? -eq 0 ] || usage 1
@@ -108,6 +110,7 @@ do
-h|--help) usage 0 ;;
--version) version ;;
-e|--exact) EXACT="true"; shift 1 ;;
+ -o|--orphans) ORPHANS="true"; shift 1 ;;
-p|--pretend) PRETEND="true"; shift 1 ;;
-n|--nocolour|--nocolor) NOCOLOUR="true"; shift 1 ;;
-a|--action)
@@ -256,7 +259,9 @@ NO_OF_FILES=$(sed -n '$=' "${TMPFILE}")
[ ${NO_OF_FILES} -eq 1 ] && s= || s=s
message "Assigning ${NO_OF_FILES} file${s} to packages ..."
-if [ "${EXACT}" ]; then
+if [ "${ORPHANS}" ]; then
+ qfile -oCR -f "${TMPFILE}" | sort -u
+elif [ "${EXACT}" ]; then
qfile -eqCR -f "${TMPFILE}" | sort -u | sed 's/^/=/' > "${PKGFILE}"
else
qfile -qCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
diff --git a/emacs-updater.8 b/emacs-updater.8
index 2d8e157..3789882 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -36,6 +36,9 @@ Match exact versions when remerging packages
.B -n, --nocolour, --nocolor
Disable colour in output
.TP
+.B -o, --orphans
+List orphan files, i.e. files that are not owned by any package.
+.TP
.B -p, --pretend
Don't actually emerge packages
.TP
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
2012-05-06 16:07 [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1480 " Sebastian Pipping
@ 2012-05-06 16:06 ` Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 1edc608be5cb86ae31eddecb2f6753b0b98db431
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 12:48:59 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 12:48:59 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1edc608b
New --orphans option (and commit forgotten ChangeLog entry for --version).
svn path=/emacs-updater/; revision=1364
---
ChangeLog | 8 ++++++++
emacs-updater | 11 ++++++++---
emacs-updater.8 | 3 +++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2189a14..358e64b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-25 Ulrich Mueller <ulm@gentoo.org>
+
+ * emacs-updater (OPTIONS): New options --orphans|-o and --version.
+ (ORPHANS): New variable.
+ (version): New function.
+ (usage): Update help text.
+ * emacs-updater.8: Describe new options.
+
2009-08-09 Ulrich Mueller <ulm@gentoo.org>
* emacs-updater (OPTIONS): New option --package-manager-command.
diff --git a/emacs-updater b/emacs-updater
index b81ce90..f6d0c5a 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -20,6 +20,7 @@ PM_COMMAND=pm_auto
# Other default variable settings
EXACT=
NOCOLOUR=
+ORPHANS=
PRETEND=
usage() {
@@ -40,6 +41,7 @@ usage() {
X -e, --exact match exact versions when remerging packages
X -n, --nocolour, --nocolor
X disable colour in output
+ X -o, --orphans list orphan files
X -p, --pretend don't actually emerge packages
X -P, --package-manager PM
X select a package manager. PM is one out of
@@ -94,8 +96,8 @@ pm_auto() {
}
# Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C getopt -o a:ehnpP: \
- --long action:,exact,help,nocolour,nocolor,pretend \
+OPTIONS=$(LC_ALL=C getopt -o a:ehnopP: \
+ --long action:,exact,help,nocolour,nocolor,orphans,pretend \
--long package-manager:,package-manager-command:,version \
-n 'emacs-updater' -- "$@")
[ $? -eq 0 ] || usage 1
@@ -108,6 +110,7 @@ do
-h|--help) usage 0 ;;
--version) version ;;
-e|--exact) EXACT="true"; shift 1 ;;
+ -o|--orphans) ORPHANS="true"; shift 1 ;;
-p|--pretend) PRETEND="true"; shift 1 ;;
-n|--nocolour|--nocolor) NOCOLOUR="true"; shift 1 ;;
-a|--action)
@@ -256,7 +259,9 @@ NO_OF_FILES=$(sed -n '$=' "${TMPFILE}")
[ ${NO_OF_FILES} -eq 1 ] && s= || s=s
message "Assigning ${NO_OF_FILES} file${s} to packages ..."
-if [ "${EXACT}" ]; then
+if [ "${ORPHANS}" ]; then
+ qfile -oCR -f "${TMPFILE}" | sort -u
+elif [ "${EXACT}" ]; then
qfile -eqCR -f "${TMPFILE}" | sort -u | sed 's/^/=/' > "${PKGFILE}"
else
qfile -qCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
diff --git a/emacs-updater.8 b/emacs-updater.8
index 2d8e157..3789882 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -36,6 +36,9 @@ Match exact versions when remerging packages
.B -n, --nocolour, --nocolor
Disable colour in output
.TP
+.B -o, --orphans
+List orphan files, i.e. files that are not owned by any package.
+.TP
.B -p, --pretend
Don't actually emerge packages
.TP
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 0e3a641a7dd428434e67cfcc445dc782c9ab2538
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 17:02:39 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 17:02:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=0e3a641a
Version 1.9 released.
svn path=/emacs-updater/; revision=1663
---
ChangeLog | 2 ++
emacs-updater | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index aded0c8..34b03a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-08-24 Ulrich Mueller <ulm@gentoo.org>
+ * Version 1.9 released.
+
* emacs-updater (action_rebuild): When comparing Emacs versions,
ignore the last component, i.e. the local build number.
diff --git a/emacs-updater b/emacs-updater
index 3875123..76b70cd 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -7,7 +7,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Mueller <ulm@gentoo.org>
-VERSION=1.8
+VERSION=1.9
EMACS=/usr/bin/emacs
SITELISP=/usr/share/emacs/site-lisp
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: d20c9343b4e10351e11b7c512df4f0887ad47e17
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 12:49:13 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 12:49:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=d20c9343
Encode man page as utf-8.
svn path=/emacs-updater/; revision=1662
---
emacs-updater.8 | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/emacs-updater.8 b/emacs-updater.8
index 27e17c9..f0617d7 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,8 +1,9 @@
+.\" -*- coding: utf-8 -*-
.\" Copyright 2008-2011 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2 or later
.\" $Id$
.\"
-.TH emacs-updater 8 "April 2011" "Gentoo Linux"
+.TH emacs-updater 8 "August 2011" "Gentoo Linux"
.SH NAME
emacs-updater \- rebuild Emacs packages
.SH SYNOPSIS
@@ -89,7 +90,7 @@ option are allowed.
.SH AUTHORS
Christian Faulhammer <fauli@gentoo.org>
.br
-Ulrich Mueller <ulm@gentoo.org>
+Ulrich Müller <ulm@gentoo.org>
.SH SEE ALSO
.BR emacs (1),
.BR qfile (1)
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 81635e93ca3efb151c6e2ff37423a9431b65935e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 06:58:24 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 06:58:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=81635e93
Tiny correction in usage output.
svn path=/emacs-updater/; revision=1660
---
emacs-updater | 2 +-
emacs-updater.8 | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/emacs-updater b/emacs-updater
index 2805154..e314137 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -60,7 +60,7 @@ usage() {
X -h, --help display this help and exit
X --version output version information and exit
X
- X -- OPTIONS Pass additional OPTIONS to package manager
+ X -- OPTION... Pass additional options to package manager
EOF
exit ${1}
}
diff --git a/emacs-updater.8 b/emacs-updater.8
index 828327f..27e17c9 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -77,10 +77,9 @@ Display help and exit.
.B --version
Output version information and exit.
.TP
-.BI -- " OPTIONS"
-Pass additional
-.I OPTIONS
-to package manager. This must be last on the command line.
+.BI -- " OPTION..."
+Pass additional options to package manager. This must be last on the
+command line.
.SH ENVIRONMENT
.TP
.B PACKAGE_MANAGER
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 2f0961902ee8da70f8d2678a20f08f606aa85c56
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 7 19:21:07 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jan 7 19:21:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=2f096190
Version 1.8 released.
svn path=/emacs-updater/; revision=1642
---
ChangeLog | 2 ++
emacs-updater | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a100b11..1f10605 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-01-05 Ulrich Mueller <ulm@gentoo.org>
+ * Version 1.8 released.
+
* emacs-updater: Use wc instead of sed for line counting; the
latter did not work for empty files. Postpone message that no
packages have been found.
diff --git a/emacs-updater b/emacs-updater
index 59ac937..d369c2b 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -7,7 +7,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Mueller <ulm@gentoo.org>
-VERSION=1.7
+VERSION=1.8
EMACS=/usr/bin/emacs
SITELISP=/usr/share/emacs/site-lisp
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 1c3c9bfd8add03aeb5c273b252ec3adfaa5d8a11
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 12:42:28 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 12:42:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1c3c9bfd
Ignore last component when comparing Emacs versions.
svn path=/emacs-updater/; revision=1661
---
ChangeLog | 5 +++++
emacs-updater | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a929315..aded0c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-24 Ulrich Mueller <ulm@gentoo.org>
+
+ * emacs-updater (action_rebuild): When comparing Emacs versions,
+ ignore the last component, i.e. the local build number.
+
2011-04-06 Ulrich Mueller <ulm@gentoo.org>
* emacs-updater: With option --orphans, imply --action=all.
diff --git a/emacs-updater b/emacs-updater
index e314137..3875123 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -238,7 +238,7 @@ action_rebuild() {
version=$(bytecomp_version "${elc}")
version=${version:-unknown}
- if [ -z "${MAJOR}" -a "${version}" != "${active}" ] \
+ if [ -z "${MAJOR}" -a "${version%.*}" != "${active%.*}" ] \
|| [ "${version%%.*}" != "${active%%.*}" ] \
|| [ "${1}" = all ]
then
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 5fb2d0ec02afe370193bfb4315e09fbe92d39838
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 6 15:44:44 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Apr 6 15:44:44 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=5fb2d0ec
With option --orphans, imply --action=all.
svn path=/emacs-updater/; revision=1655
---
ChangeLog | 5 +++++
emacs-updater | 4 ++--
emacs-updater.8 | 4 +++-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1f10605..a929315 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-06 Ulrich Mueller <ulm@gentoo.org>
+
+ * emacs-updater: With option --orphans, imply --action=all.
+ * emacs-updater.8: Document it.
+
2011-01-05 Ulrich Mueller <ulm@gentoo.org>
* Version 1.8 released.
diff --git a/emacs-updater b/emacs-updater
index d369c2b..2805154 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -47,7 +47,7 @@ usage() {
X Emacs version numbers
X -n, --nocolour, --nocolor
X disable colour in output
- X -o, --orphans list orphan files
+ X -o, --orphans list orphan files (implies '--action all')
X -p, --pretend don't actually emerge packages
X -P, --package-manager PM
X select a package manager. PM is one out of
@@ -120,7 +120,7 @@ do
-b|--batch) BATCH="true"; shift ;;
-e|--exact) EXACT="true"; shift ;;
-m|--major) MAJOR="true"; shift ;;
- -o|--orphans) ORPHANS="true"; shift ;;
+ -o|--orphans) ORPHANS="true"; ACTIONS="all"; shift ;;
-p|--pretend) PRETEND="true"; shift ;;
-n|--nocolour|--nocolor) NOCOLOUR="true"; shift ;;
-a|--action)
diff --git a/emacs-updater.8 b/emacs-updater.8
index 7fbe7a9..828327f 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -2,7 +2,7 @@
.\" Distributed under the terms of the GNU General Public License v2 or later
.\" $Id$
.\"
-.TH emacs-updater 8 "November 2010" "Gentoo Linux"
+.TH emacs-updater 8 "April 2011" "Gentoo Linux"
.SH NAME
emacs-updater \- rebuild Emacs packages
.SH SYNOPSIS
@@ -44,6 +44,8 @@ Disable colour in output.
.TP
.B -o, --orphans
List orphan files, i.e. files that are not owned by any package.
+Implies
+.BR "--action all" .
.TP
.B -p, --pretend
Don't actually emerge packages.
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 472e48ce37252350910d6b381b827cdb528e3845
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 17:06:29 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 17:06:29 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=472e48ce
Version 1.7 released.
svn path=/emacs-updater/; revision=1588
---
ChangeLog | 2 ++
emacs-updater | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fd1607c..b8dbd39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2010-11-09 Ulrich Mueller <ulm@gentoo.org>
+ * Version 1.7 released.
+
* emacs-updater (pm_portage, pm_pkgcore): Don't specify options
that are not strictly necessary. Fixes bug 344467.
(PM_EXTRAOPTS): New variable, saves any additional options after
diff --git a/emacs-updater b/emacs-updater
index b3eec32..e5ded44 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -7,7 +7,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Mueller <ulm@gentoo.org>
-VERSION=1.6
+VERSION=1.7
EMACS=/usr/bin/emacs
SITELISP=/usr/share/emacs/site-lisp
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 299302790eed39228e9231e913301514bfd3e8b0
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 5 10:27:45 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan 5 10:27:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=29930279
Update copyright year.
svn path=/emacs-updater/; revision=1640
---
ChangeLog | 2 +-
Makefile | 2 +-
emacs-updater | 4 ++--
emacs-updater.8 | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 095926b..e13f8f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -267,6 +267,6 @@
* emacs-updater.sh: first version of Emacs updater
-Copyright 2007-2010 Gentoo Foundation
+Copyright 2007-2011 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2 or later
$Id$
diff --git a/Makefile b/Makefile
index 9613036..9551584 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2008-2010 Gentoo Foundation
+# Copyright 2008-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
# $Id$
diff --git a/emacs-updater b/emacs-updater
index 6abb8f6..d2cb91e 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2007-2010 Gentoo Foundation
+# Copyright 2007-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
# $Id$
@@ -68,7 +68,7 @@ usage() {
version() {
cat <<-EOF
Emacs updater version ${VERSION}
- Copyright 2007-2010 Gentoo Foundation.
+ Copyright 2007-2011 Gentoo Foundation.
Distributed under the terms of the GNU GPL version 2 or later.
Gentoo Emacs project: <http://www.gentoo.org/proj/en/lisp/emacs/>
diff --git a/emacs-updater.8 b/emacs-updater.8
index 0a033db..7fbe7a9 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,4 +1,4 @@
-.\" Copyright 2008-2010 Gentoo Foundation
+.\" Copyright 2008-2011 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2 or later
.\" $Id$
.\"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: bc4e5689c58ffd2870da87973a2d609ab126807b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 5 11:11:27 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan 5 11:11:27 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=bc4e5689
Use wc instead of sed for line counting. Postpone "no packages" message.
svn path=/emacs-updater/; revision=1641
---
ChangeLog | 6 ++++++
emacs-updater | 18 +++++++++---------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e13f8f2..a100b11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-05 Ulrich Mueller <ulm@gentoo.org>
+
+ * emacs-updater: Use wc instead of sed for line counting; the
+ latter did not work for empty files. Postpone message that no
+ packages have been found.
+
2010-11-27 Ulrich Mueller <ulm@gentoo.org>
* emacs-updater (have_paludis, pm_paludis): Use cave instead of
diff --git a/emacs-updater b/emacs-updater
index d2cb91e..59ac937 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -273,8 +273,8 @@ if [ ! -s "${TMPFILE}" ]; then
exit 3
fi
-NO_OF_FILES=$(sed -n '$=' "${TMPFILE}")
-[ ${NO_OF_FILES} -eq 1 ] && s= || s=s
+NO_OF_FILES=$(wc -l <"${TMPFILE}")
+[ "${NO_OF_FILES}" -eq 1 ] && s= || s=s
message "Assigning ${NO_OF_FILES} file${s} to packages ..."
if [ "${ORPHANS}" ]; then
@@ -287,13 +287,8 @@ else
# qfile -eqCR -f "${TMPFILE}" | sort -u | xargs qlist -eqCILS
fi
-if [ ! -s "${PKGFILE}" ]; then
- warning "No packages to update, quitting."
- exit 3
-fi
-
-NO_OF_PACKAGES=$(sed -n '$=' "${PKGFILE}")
-[ ${NO_OF_PACKAGES} -eq 1 ] && s= || s=s
+NO_OF_PACKAGES=$(wc -l <"${PKGFILE}")
+[ "${NO_OF_PACKAGES}" -eq 1 ] && s= || s=s
if [ "${ORPHANS}" ]; then
message "${NO_OF_PACKAGES} orphan file${s} found:"
else
@@ -307,6 +302,11 @@ if [ "${PRETEND}" -o "${ORPHANS}" ]; then
fi
echo
+if [ "${NO_OF_PACKAGES}" -eq 0 ]; then
+ warning "No packages to update, quitting."
+ exit 3
+fi
+
if [ "${BATCH}" ]; then
message "Remerging packages ..."
else
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: ffd4e598347bfab6744ac75c4743330fee1fee1b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 16:46:05 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Nov 27 16:46:05 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=ffd4e598
Use cave instead of paludis.
svn path=/emacs-updater/; revision=1594
---
ChangeLog | 5 +++++
emacs-updater | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b8dbd39..095926b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-27 Ulrich Mueller <ulm@gentoo.org>
+
+ * emacs-updater (have_paludis, pm_paludis): Use cave instead of
+ paludis.
+
2010-11-09 Ulrich Mueller <ulm@gentoo.org>
* Version 1.7 released.
diff --git a/emacs-updater b/emacs-updater
index e5ded44..d60bd02 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -83,8 +83,8 @@ pm_portage() { emerge --oneshot "$@"; }
have_pkgcore() { type -P pmerge >/dev/null; }
pm_pkgcore() { pmerge --oneshot "$@"; }
-have_paludis() { type -P paludis >/dev/null; }
-pm_paludis() { paludis --install --preserve-world "$@"; }
+have_paludis() { type -P cave >/dev/null; }
+pm_paludis() { cave resolve --execute --preserve-world "$@"; }
pm_auto() {
local pm
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 6a2b8d772846eeaa07c6f01961426b3e2cdb4605
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 5 09:24:26 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan 5 09:24:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=6a2b8d77
Remove a word.
svn path=/emacs-updater/; revision=1639
---
emacs-updater | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/emacs-updater b/emacs-updater
index d60bd02..6abb8f6 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -242,10 +242,10 @@ action_rebuild() {
|| [ "${version%%.*}" != "${active%%.*}" ] \
|| [ "${1}" = all ]
then
- echo "Found ${elc##*/} (compiled by Emacs version ${version})"
+ echo "Found ${elc##*/} (compiled by Emacs ${version})"
echo "${elc}" >> "${TMPFILE}"
else
- echo "Skipping ${elc##*/} (compiled by Emacs version ${version})"
+ echo "Skipping ${elc##*/} (compiled by Emacs ${version})"
fi
done
echo
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 262ba32ce3990b0780610442d06b791c62ad87b0
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 9 21:54:17 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Nov 9 21:54:17 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=262ba32c
New option --batch|-b for non-interactive mode.
svn path=/emacs-updater/; revision=1586
---
ChangeLog | 6 ++++--
emacs-updater | 28 ++++++++++++++++------------
emacs-updater.8 | 3 +++
3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f91c631..fd1607c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,10 @@
(PM_EXTRAOPTS): New variable, saves any additional options after
the -- separator, so that they can be passed to the package
manager later on.
- (usage): Update.
- * emacs-updater.8: Update.
+ (OPTIONS): New option --batch|-b for non-interactive mode.
+ (BATCH): New variable.
+ (usage): Update help text.
+ * emacs-updater.8: Describe new options.
2010-01-04 Christian Faulhammer <fauli@gentoo.org>
diff --git a/emacs-updater b/emacs-updater
index e7e0813..d271a1d 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -19,6 +19,7 @@ PM_COMMAND=pm_auto
PM_EXTRAOPTS=( )
# Other default variable settings
+BATCH=
EXACT=
MAJOR=
NOCOLOUR=
@@ -40,6 +41,7 @@ usage() {
X 'all': rebuild all packages that have
X byte-compiled Elisp files
X (default: sitedir,rebuild)
+ X -b, --batch batch mode, don't ask any questions
X -e, --exact match exact versions when remerging packages
X -m, --major use only the major version when comparing
X Emacs version numbers
@@ -102,8 +104,8 @@ pm_auto() {
}
# Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C getopt -o a:ehmnopP: \
- --long action:,exact,help,major,nocolour,nocolor,orphans,pretend \
+OPTIONS=$(LC_ALL=C getopt -o a:behmnopP: \
+ --long action:,batch,exact,help,major,nocolour,nocolor,orphans,pretend \
--long package-manager:,package-manager-command:,version \
-n 'emacs-updater' -- "$@")
[ $? -eq 0 ] || usage 1
@@ -115,6 +117,7 @@ do
case "${1}" in
-h|--help) usage 0 ;;
--version) version ;;
+ -b|--batch) BATCH="true"; shift ;;
-e|--exact) EXACT="true"; shift ;;
-m|--major) MAJOR="true"; shift ;;
-o|--orphans) ORPHANS="true"; shift ;;
@@ -303,16 +306,17 @@ if [ "${PRETEND}" -o "${ORPHANS}" ]; then
fi
echo
-echo -n "${BOLD}Remerge packages?${NORMAL} [${GREEN}Yes${NORMAL}/${RED}No${NORMAL}] "
-read choice
-echo
-case "${choice}" in
- y*|Y*|"")
- ;;
- *)
- warning "Quitting."
- exit 10 ;;
-esac
+if [ "${BATCH}" ]; then
+ message "Remerging packages ..."
+else
+ echo -n "${BOLD}Remerge packages?${NORMAL} [${GREEN}Yes${NORMAL}/${RED}No${NORMAL}] "
+ read choice
+ echo
+ case "${choice}" in
+ y*|Y*|"") ;;
+ *) warning "Quitting."; exit 10 ;;
+ esac
+fi
${PM_COMMAND} "${PM_EXTRAOPTS[@]}" $(<"${PKGFILE}")
diff --git a/emacs-updater.8 b/emacs-updater.8
index f368662..0a033db 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -30,6 +30,9 @@ Rebuild all packages that have byte-compiled Elisp files.
.BR sitedir ,
.BR rebuild )
.TP
+.B -b, --batch
+Batch mode, don't ask the user any questions.
+.TP
.B -e, --exact
Match exact versions when remerging packages.
.TP
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 658dcfabc89f89ad7884e906501491764c38d649
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 9 18:31:44 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Nov 9 18:31:44 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=658dcfab
Allow for additional options passed to the package manager, bug 344467.
svn path=/emacs-updater/; revision=1584
---
ChangeLog | 10 ++++++++++
emacs-updater | 11 +++++++----
emacs-updater.8 | 7 ++++++-
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 442c7aa..f91c631 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-09 Ulrich Mueller <ulm@gentoo.org>
+
+ * emacs-updater (pm_portage, pm_pkgcore): Don't specify options
+ that are not strictly necessary. Fixes bug 344467.
+ (PM_EXTRAOPTS): New variable, saves any additional options after
+ the -- separator, so that they can be passed to the package
+ manager later on.
+ (usage): Update.
+ * emacs-updater.8: Update.
+
2010-01-04 Christian Faulhammer <fauli@gentoo.org>
* emacs-updater (pm_portage): Add --keep-going option for user
diff --git a/emacs-updater b/emacs-updater
index f1d80b6..e63d1e6 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -16,6 +16,7 @@ ACTIONS="sitedir rebuild"
# Default package manager
PM_COMMAND=pm_auto
+PM_EXTRAOPTS=( )
# Other default variable settings
EXACT=
@@ -56,6 +57,8 @@ usage() {
X the whole command string must be quoted
X -h, --help display this help and exit
X --version output version information and exit
+ X
+ X -- OPTIONS Pass additional OPTIONS to package manager
EOF
exit ${1}
}
@@ -73,10 +76,10 @@ version() {
# Wrapper for package manager commands
have_portage() { type -P emerge >/dev/null; }
-pm_portage() { emerge --oneshot --ask --verbose --keep-going "$@"; }
+pm_portage() { emerge --oneshot "$@"; }
have_pkgcore() { type -P pmerge >/dev/null; }
-pm_pkgcore() { pmerge --oneshot --ask "$@"; }
+pm_pkgcore() { pmerge --oneshot "$@"; }
have_paludis() { type -P paludis >/dev/null; }
pm_paludis() { paludis --install --preserve-world "$@"; }
@@ -150,7 +153,7 @@ do
shift 2
;;
--package-manager-command) PM_COMMAND=${2}; shift 2 ;;
- --) shift; break ;;
+ --) shift; PM_EXTRAOPTS=( "$@" ); break ;;
*)
# this should not happen; getopt should return bad status
echo "Invalid option '${1}' given!"
@@ -311,7 +314,7 @@ case "${choice}" in
exit 10 ;;
esac
-${PM_COMMAND} $(<"${PKGFILE}")
+${PM_COMMAND} "${PM_EXTRAOPTS[@]}" $(<"${PKGFILE}")
warning "If a package is being rebuilt over and over again,"
warning "please report it on http://bugs.gentoo.org/"
diff --git a/emacs-updater.8 b/emacs-updater.8
index 55d6bdf..f368662 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -2,7 +2,7 @@
.\" Distributed under the terms of the GNU General Public License v2 or later
.\" $Id$
.\"
-.TH emacs-updater 8 "August 2009" "Gentoo Linux"
+.TH emacs-updater 8 "November 2010" "Gentoo Linux"
.SH NAME
emacs-updater \- rebuild Emacs packages
.SH SYNOPSIS
@@ -71,6 +71,11 @@ Display help and exit.
.TP
.B --version
Output version information and exit.
+.TP
+.BI -- " OPTIONS"
+Pass additional
+.I OPTIONS
+to package manager. This must be last on the command line.
.SH ENVIRONMENT
.TP
.B PACKAGE_MANAGER
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 5dbc1a4fae103f213da6ffafa207ecce700881cd
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 9 22:12:12 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Nov 9 22:12:12 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=5dbc1a4f
Style.
svn path=/emacs-updater/; revision=1587
---
emacs-updater | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/emacs-updater b/emacs-updater
index d271a1d..b3eec32 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -240,7 +240,8 @@ action_rebuild() {
if [ -z "${MAJOR}" -a "${version}" != "${active}" ] \
|| [ "${version%%.*}" != "${active%%.*}" ] \
- || [ "${1}" = all ]; then
+ || [ "${1}" = all ]
+ then
echo "Found ${elc##*/} (compiled by Emacs version ${version})"
echo "${elc}" >> "${TMPFILE}"
else
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 1f09f04a0b9d6709fdcc77d1e658e1cafdbd0eff
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 9 21:34:58 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Nov 9 21:34:58 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1f09f04a
Default argument for shift.
svn path=/emacs-updater/; revision=1585
---
emacs-updater | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/emacs-updater b/emacs-updater
index e63d1e6..e7e0813 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -115,11 +115,11 @@ do
case "${1}" in
-h|--help) usage 0 ;;
--version) version ;;
- -e|--exact) EXACT="true"; shift 1 ;;
- -m|--major) MAJOR="true"; shift 1 ;;
- -o|--orphans) ORPHANS="true"; shift 1 ;;
- -p|--pretend) PRETEND="true"; shift 1 ;;
- -n|--nocolour|--nocolor) NOCOLOUR="true"; shift 1 ;;
+ -e|--exact) EXACT="true"; shift ;;
+ -m|--major) MAJOR="true"; shift ;;
+ -o|--orphans) ORPHANS="true"; shift ;;
+ -p|--pretend) PRETEND="true"; shift ;;
+ -n|--nocolour|--nocolor) NOCOLOUR="true"; shift ;;
-a|--action)
ACTIONS=
for action in ${2/,/ }; do
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 6170b3b36f1a0ba95a24dae44be53fce88646ddd
Author: Christian Faulhammer <fauli <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 4 13:05:12 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 13:05:12 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=6170b3b3
emacs-updater: (pm_portage) Add --keep-going option for user convenience
svn path=/emacs-updater/; revision=1495
---
ChangeLog | 5 +++++
emacs-updater | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 37b0c4b..3e371a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-04 Christian Faulhammer <fauli@gentoo.org>
+
+ * emacs-updater (pm_portage): Add --keep-going option for user
+ convenience
+
2009-08-27 Ulrich Mueller <ulm@gentoo.org>
* Version 1.6 released.
diff --git a/emacs-updater b/emacs-updater
index 37d1e38..79e61e7 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -73,7 +73,7 @@ version() {
# Wrapper for package manager commands
have_portage() { type -P emerge >/dev/null; }
-pm_portage() { emerge --oneshot --ask --verbose "$@"; }
+pm_portage() { emerge --oneshot --ask --verbose --keep-going "$@"; }
have_pkgcore() { type -P pmerge >/dev/null; }
pm_pkgcore() { pmerge --oneshot --ask "$@"; }
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 25b4bf234ef3cd3010161e561b48f619bf4e6d38
Author: Christian Faulhammer <fauli <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 4 13:07:15 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 13:07:15 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=25b4bf23
Another typo fix
svn path=/emacs-updater/; revision=1497
---
ChangeLog | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cd1e7df..97ef0b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -233,7 +233,7 @@
same and is actually used
Increase version number to 0.2
Head information reformatted with normal echo without pretty
- output, adding author Info
+ output, adding author info
Quit message uses warning() instead of message()
2007-11-28 Christian Faulhammer <opfer@gentoo.org>
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 90f99c04926b441b1dd8dafe800b47734779caf0
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 22:29:17 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 22:29:17 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=90f99c04
Allow distribution under GPL-2 or later for all files.
svn path=/emacs-updater/; revision=1529
---
ChangeLog | 2 +-
Makefile | 2 +-
emacs-updater | 6 +++---
emacs-updater.8 | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 012a4e1..442c7aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -249,5 +249,5 @@
* emacs-updater.sh: first version of Emacs updater
Copyright 2007-2010 Gentoo Foundation
-Distributed under the terms of the GNU General Public License v2
+Distributed under the terms of the GNU General Public License v2 or later
$Id$
diff --git a/Makefile b/Makefile
index 2cc88f5..9613036 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
# Copyright 2008-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
+# Distributed under the terms of the GNU General Public License v2 or later
# $Id$
PN = emacs-updater
diff --git a/emacs-updater b/emacs-updater
index a6f6053..f1d80b6 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright 2007-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
+# Distributed under the terms of the GNU General Public License v2 or later
# $Id$
# Authors:
@@ -63,8 +63,8 @@ usage() {
version() {
cat <<-EOF
Emacs updater version ${VERSION}
- Copyright 2007-2009 Gentoo Foundation.
- Distributed under the terms of the GNU General Public License v2.
+ Copyright 2007-2010 Gentoo Foundation.
+ Distributed under the terms of the GNU GPL version 2 or later.
Gentoo Emacs project: <http://www.gentoo.org/proj/en/lisp/emacs/>
EOF
diff --git a/emacs-updater.8 b/emacs-updater.8
index c196b44..55d6bdf 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,5 +1,5 @@
.\" Copyright 2008-2010 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
+.\" Distributed under the terms of the GNU General Public License v2 or later
.\" $Id$
.\"
.TH emacs-updater 8 "August 2009" "Gentoo Linux"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 5d53a37ca19285d4feb8a663b7f4454597213222
Author: Christian Faulhammer <fauli <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 4 13:06:01 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 13:06:01 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=5d53a37c
Correct typo
svn path=/emacs-updater/; revision=1496
---
ChangeLog | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3e371a5..cd1e7df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -165,7 +165,7 @@
packages with .elc files in the ${SITELISP} directory
raise version to 0.7
- * emacs-updater: canonify exit codes amd remove some ambiguities
+ * emacs-updater: canonify exit codes and remove some ambiguities
2008-02-29 Ulrich Mueller <ulm@gentoo.org>
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: a4a7c24d0f2f6e85554f463cf9abeacf02a5e71f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 05:08:39 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 05:08:39 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=a4a7c24d
Version 1.6 released.
svn path=/emacs-updater/; revision=1392
---
ChangeLog | 4 ++++
emacs-updater | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7b18317..37b0c4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-27 Ulrich Mueller <ulm@gentoo.org>
+
+ * Version 1.6 released.
+
2009-08-25 Ulrich Mueller <ulm@gentoo.org>
* emacs-updater (OPTIONS): New options --major|-m, --orphans|-o,
diff --git a/emacs-updater b/emacs-updater
index 8027f27..37d1e38 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -7,7 +7,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Mueller <ulm@gentoo.org>
-VERSION=1.5
+VERSION=1.6
EMACS=/usr/bin/emacs
SITELISP=/usr/share/emacs/site-lisp
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 5716446e96bbd386a15a013ec110852c19d67f23
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 10:46:26 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 10:46:26 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=5716446e
Add svn keywords.
svn path=/emacs-updater/; revision=1521
---
ChangeLog | 3 ++-
Makefile | 3 ++-
emacs-updater | 2 +-
emacs-updater.8 | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 97ef0b9..012a4e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -248,5 +248,6 @@
* emacs-updater.sh: first version of Emacs updater
-Copyright 2007-2009 Gentoo Foundation
+Copyright 2007-2010 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2
+$Id$
diff --git a/Makefile b/Makefile
index 9da9031..2cc88f5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
-# Copyright 2008 Gentoo Foundation
+# Copyright 2008-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
PN = emacs-updater
PV = $(shell sed '/^VERSION/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' emacs-updater)
diff --git a/emacs-updater b/emacs-updater
index 79e61e7..a6f6053 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2007-2009 Gentoo Foundation
+# Copyright 2007-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/emacs-updater.8 b/emacs-updater.8
index 9b32365..c196b44 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,4 +1,4 @@
-.\" Copyright 2008-2009 Gentoo Foundation
+.\" Copyright 2008-2010 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2
.\" $Id$
.\"
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 66+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: f660dd132fdb09702ac56d79d0a3b06805dc609c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 18:50:58 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 18:50:58 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f660dd13
New --major option.
svn path=/emacs-updater/; revision=1390
---
ChangeLog | 5 +++--
emacs-updater | 17 ++++++++++++++---
emacs-updater.8 | 3 +++
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 358e64b..7b18317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
2009-08-25 Ulrich Mueller <ulm@gentoo.org>
- * emacs-updater (OPTIONS): New options --orphans|-o and --version.
- (ORPHANS): New variable.
+ * emacs-updater (OPTIONS): New options --major|-m, --orphans|-o,
+ and --version.
+ (MAJOR, ORPHANS): New variables.
(version): New function.
(usage): Update help text.
* emacs-updater.8: Describe new options.
diff --git a/emacs-updater b/emacs-updater
index 8832fed..8027f27 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -19,6 +19,7 @@ PM_COMMAND=pm_auto
# Other default variable settings
EXACT=
+MAJOR=
NOCOLOUR=
ORPHANS=
PRETEND=
@@ -39,6 +40,8 @@ usage() {
X byte-compiled Elisp files
X (default: sitedir,rebuild)
X -e, --exact match exact versions when remerging packages
+ X -m, --major use only the major version when comparing
+ X Emacs version numbers
X -n, --nocolour, --nocolor
X disable colour in output
X -o, --orphans list orphan files
@@ -96,8 +99,8 @@ pm_auto() {
}
# Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C getopt -o a:ehnopP: \
- --long action:,exact,help,nocolour,nocolor,orphans,pretend \
+OPTIONS=$(LC_ALL=C getopt -o a:ehmnopP: \
+ --long action:,exact,help,major,nocolour,nocolor,orphans,pretend \
--long package-manager:,package-manager-command:,version \
-n 'emacs-updater' -- "$@")
[ $? -eq 0 ] || usage 1
@@ -110,6 +113,7 @@ do
-h|--help) usage 0 ;;
--version) version ;;
-e|--exact) EXACT="true"; shift 1 ;;
+ -m|--major) MAJOR="true"; shift 1 ;;
-o|--orphans) ORPHANS="true"; shift 1 ;;
-p|--pretend) PRETEND="true"; shift 1 ;;
-n|--nocolour|--nocolor) NOCOLOUR="true"; shift 1 ;;
@@ -147,6 +151,11 @@ do
;;
--package-manager-command) PM_COMMAND=${2}; shift 2 ;;
--) shift; break ;;
+ *)
+ # this should not happen; getopt should return bad status
+ echo "Invalid option '${1}' given!"
+ usage 22
+ ;;
esac
done
@@ -223,7 +232,9 @@ action_rebuild() {
version=$(bytecomp_version "${elc}")
version=${version:-unknown}
- if [ "${version}" != "${active}" ] || [ "${1}" = all ]; then
+ if [ -z "${MAJOR}" -a "${version}" != "${active}" ] \
+ || [ "${version%%.*}" != "${active%%.*}" ] \
+ || [ "${1}" = all ]; then
echo "Found ${elc##*/} (compiled by Emacs version ${version})"
echo "${elc}" >> "${TMPFILE}"
else
diff --git a/emacs-updater.8 b/emacs-updater.8
index 3789882..b05fcae 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -33,6 +33,9 @@ Rebuild all packages that have byte-compiled Elisp files
.B -e, --exact
Match exact versions when remerging packages
.TP
+.B -m, --major
+Use only the major version when comparing Emacs version numbers
+.TP
.B -n, --nocolour, --nocolor
Disable colour in output
.TP
^ permalink raw reply related [flat|nested] 66+ messages in thread
end of thread, other threads:[~2024-06-05 14:08 UTC | newest]
Thread overview: 66+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-06 16:06 [gentoo-commits] proj/emacs-tools:emacs-updater commit in: / Sebastian Pipping
2012-05-06 16:07 ` [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1480 " Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2024-06-05 14:08 [gentoo-commits] proj/emacs-tools:emacs-updater " Ulrich Müller
2024-05-02 16:52 Ulrich Müller
2024-05-02 16:52 Ulrich Müller
2024-05-02 16:52 Ulrich Müller
2024-05-02 16:52 Ulrich Müller
2023-09-25 18:54 Ulrich Müller
2023-09-25 18:47 Ulrich Müller
2019-08-30 22:02 Ulrich Müller
2019-08-30 22:02 Ulrich Müller
2018-12-09 22:37 Ulrich Müller
2018-09-16 14:50 Ulrich Müller
2016-06-08 6:53 Ulrich Müller
2016-06-07 22:20 Ulrich Müller
2016-06-07 13:06 Ulrich Müller
2016-06-07 12:50 Ulrich Müller
2016-06-07 12:50 Ulrich Müller
2014-06-05 17:07 Ulrich Müller
2014-06-05 16:43 Ulrich Müller
2014-05-20 6:49 Ulrich Müller
2014-05-19 18:14 Ulrich Müller
2014-05-19 18:14 Ulrich Müller
2013-08-09 13:57 Ulrich Mueller
2013-03-20 17:03 Ulrich Mueller
2013-03-20 16:54 Ulrich Mueller
2013-03-12 18:55 Ulrich Mueller
2013-03-12 18:55 Ulrich Mueller
2013-03-12 18:55 Ulrich Mueller
2013-03-11 11:27 Ulrich Mueller
2013-03-11 10:15 Ulrich Mueller
2013-03-11 9:43 Ulrich Mueller
2013-03-11 8:23 Ulrich Mueller
2013-03-09 12:31 Ulrich Mueller
2013-03-09 12:31 Ulrich Mueller
2013-03-09 12:31 Ulrich Mueller
2012-10-11 8:20 Ulrich Mueller
2012-10-11 8:20 Ulrich Mueller
2012-10-08 20:59 Ulrich Mueller
2012-10-08 20:45 Ulrich Mueller
2012-05-06 18:47 Ulrich Mueller
2012-05-06 18:14 Ulrich Mueller
2012-05-06 16:07 [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1480 " Sebastian Pipping
2012-05-06 16:06 ` [gentoo-commits] proj/emacs-tools:emacs-updater " Sebastian Pipping
2012-05-06 16:07 [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1480 " Sebastian Pipping
2012-05-06 16:06 ` [gentoo-commits] proj/emacs-tools:emacs-updater " Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox