From 0a2acee424a13bb6ac550c5ce65ea3423b92336f Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Thu, 21 Feb 2008 11:06:20 +0000 Subject: [PATCH] bump emacs-updater to version 0.4 Package-Manager: portage-2.1.4.4 --- app-admin/eselect-emacs/ChangeLog | 5 +- app-admin/eselect-emacs/Manifest | 12 ++--- app-admin/eselect-emacs/files/emacs-updater | 56 ++++++++++++++------- 3 files changed, 48 insertions(+), 25 deletions(-) diff --git a/app-admin/eselect-emacs/ChangeLog b/app-admin/eselect-emacs/ChangeLog index 1ba88aee1189..1cd5d4aaf939 100644 --- a/app-admin/eselect-emacs/ChangeLog +++ b/app-admin/eselect-emacs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/eselect-emacs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-emacs/ChangeLog,v 1.39 2008/02/01 14:48:30 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-emacs/ChangeLog,v 1.40 2008/02/21 11:06:19 opfer Exp $ + + 21 Feb 2008; Christian Faulhammer files/emacs-updater: + bump emacs-updater to version 0.4 01 Feb 2008; Ulrich Mueller -eselect-emacs-1.1.ebuild, -eselect-emacs-1.3.ebuild: diff --git a/app-admin/eselect-emacs/Manifest b/app-admin/eselect-emacs/Manifest index 7aaf1f5b02da..5a7593d0e6d0 100644 --- a/app-admin/eselect-emacs/Manifest +++ b/app-admin/eselect-emacs/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX emacs-updater 1771 RMD160 34bae58591be4abfb0d8c23580d0567d57a12d99 SHA1 8b33aaab109694436dcd9c386b5a08a9d851b5ab SHA256 0be338c272f14ca8ae4410fac6852a8ec5d715f50fc3c6b14a19b3c1f938f663 +AUX emacs-updater 2297 RMD160 3801b7adf0aa71fd359fa4bfb2d8f25156243122 SHA1 404319daa6d786f3ff97ca0e8b6fb0f4376e33b5 SHA256 202eba514f18f1949784a3cff6d64a92df1cbe01972c037eb412a7ac413a79dd DIST eselect-emacs-1.3.tar.bz2 6597 RMD160 28552dc2e263bd26768120fc37433a14ee2feb12 SHA1 93b40064c5740d1f8c5d38e4a07d5062e2a3a22b SHA256 26ad557147a4bbf3757052d58c44874396a7724ea16af52c25e0df01f2178a29 EBUILD eselect-emacs-1.3-r2.ebuild 961 RMD160 2e65d574a4a25b8fc4bd9f8ec0598f2bb7616405 SHA1 58f422538dff2fc2049c72b826f30820e02da535 SHA256 d0daaa12e68cefbd43c4d1b920acdc1fe185d6e95b9abb60dd05f05097dcbd37 -MISC ChangeLog 5524 RMD160 eaa68bebeee7cef37bb4411371ae7b362d6737ac SHA1 47acff7e09801bde0470f2c93883d3b40f3bdb34 SHA256 3da4e3a82dd0c69888c87abad3b8de70cc2e9dc2da3676f439c8763dcaf03d4f +MISC ChangeLog 5639 RMD160 5e909e4d2fc55863b52b6bb3418f21c10b6672a8 SHA1 12a7a72bd8fd468ab30b4ce38f400d5af3666e3c SHA256 ab21c14c8db5573ec5cb8fc5cfec825440fef735e756eba0bed505f4ebc0e886 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.8 (GNU/Linux) +Version: GnuPG v2.0.7 (GNU/Linux) -iEYEARECAAYFAkejMUEACgkQOeoy/oIi7uy3VQCgjNOmDjR9ns9160nVtj9IwEOx -M4cAnAyuPYWKgCOI6Bbn+WoOWPSIyGLu -=5Tho +iD8DBQFHvVuYNQqtfCuFneMRAnxZAJ9hiX2JuCU0pUDqsnJX/VvwtH76jgCeKmlU +LbokCK2DsyKiBSYYb9lPTYY= +=6+Dh -----END PGP SIGNATURE----- diff --git a/app-admin/eselect-emacs/files/emacs-updater b/app-admin/eselect-emacs/files/emacs-updater index 6b9539f48359..51e09ebdfcdf 100755 --- a/app-admin/eselect-emacs/files/emacs-updater +++ b/app-admin/eselect-emacs/files/emacs-updater @@ -5,8 +5,37 @@ # Christian Faulhammer # Ulrich Mueller -# Only set colours if output is not redirected -if tty -s <&1; then +VERSION=0.4 +SITELISP=/usr/share/emacs/site-lisp +TMPFILE="$(mktemp /tmp/emacs-updater.XXXXXX)" + +cat <<-EOF + +Emacs updater version ${VERSION} +Written by the Gentoo Emacs team http://www.gentoo.org/proj/en/lisp/emacs/ +Find packages that are installed in the wrong location + +EOF + +# Read in all command-line options and force English output +OPTIONS=$(LC_ALL=C getopt -o hpn --long help,pretend,nocolour \ + -n 'emacs-updater' -- "$@") + +eval set -- "${OPTIONS}" + +while true +do + case "${1}" in + -h|--help) echo "You have the following options: --pretend|-p and/or --no-colour|-n" ; exit 0 ;; + -p|--pretend) PRETEND="true"; shift 1 ;; + -n|--nocolour) NOCOLOUR="true"; shift 1;; + --) shift ; break ;; + esac +done + +# Only set colours if output is not redirected or the --no-colour +# option is not set +if tty -s <&1 && [ -z ${NOCOLOUR} ] ; then BLUE=$'\e[34;01m' GREEN=$'\e[32;01m' RED=$'\e[31;01m' @@ -16,11 +45,6 @@ if tty -s <&1; then NORMAL=$'\e[0m' fi -SITELISP=/usr/share/emacs/site-lisp -VERSION=0.3 -TMPFILE="$(mktemp /tmp/emacs-updater.XXXXXX)" - - message() { local OUTPUT=$@ echo "${GREEN}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}" @@ -36,14 +60,6 @@ failure() { echo "${RED}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}" } -cat <<-EOF - -Emacs updater version ${VERSION} -Written by the Gentoo Emacs team http://www.gentoo.org/proj/en/lisp/emacs/ -Find packages that are installed in the wrong location - -EOF - if ! [ -x /usr/bin/qfile ]; then echo failure "Please emerge app-portage/portage-utils to use this tool" @@ -66,14 +82,18 @@ fi message "Packages with site files in the wrong location:" cat "${TMPFILE}" +if [ ${PRETEND} ]; then + exit 3 +fi + echo echo -n "${BOLD}Remerge packages?${NORMAL} [${GREEN}Yes${NORMAL}/${RED}No${NORMAL}] " read choice echo case "${choice}" in - y*|Y*|"") - ;; - *) + y*|Y*|"") + ;; + *) warning "Quitting." exit 10 ;; esac -- 2.26.2