diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2023-05-11 19:04:20 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2023-05-11 19:04:20 +0200 |
| commit | ad863d288f29bcca776369dec7765dbb0174ba82 (patch) | |
| tree | 30f79a3b094fa5a28967949e1ddbfeffaa156beb /libs | |
| parent | Don't substitute PORTAGEQ in libs (diff) | |
| download | eselect-ad863d288f29bcca776369dec7765dbb0174ba82.tar.gz eselect-ad863d288f29bcca776369dec7765dbb0174ba82.tar.bz2 eselect-ad863d288f29bcca776369dec7765dbb0174ba82.zip | |
Don't autodetect bash and env-update at configure time
* bin/eselect.in: Update shebang to use EPREFIX. Bug 905934.
* bin/Makefile.am (dosed): Don't substitute BASH.
* libs/package-manager.bash.in (env_update): Don't use an absolute
path for env-update.
* libs/Makefile.am (dosed): Don't substitute ENV_UPDATE.
* configure.ac: Drop checks for bash and env-update paths.
Bug: https://bugs.gentoo.org/905934
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/Makefile.am | 1 | ||||
| -rw-r--r-- | libs/package-manager.bash.in | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libs/Makefile.am b/libs/Makefile.am index c5f3de3..debaa1d 100644 --- a/libs/Makefile.am +++ b/libs/Makefile.am @@ -28,7 +28,6 @@ EXTRA_DIST = \ dosed = @SED@ \ -e 's%\@SED\@%@SED@%g' \ - -e 's%\@ENV_UPDATE\@%@ENV_UPDATE@%g' \ -e 's%\@CANONICALISE\@%@CANONICALISE@%g' \ -e 's%\@libdir\@%@libdir@%g' diff --git a/libs/package-manager.bash.in b/libs/package-manager.bash.in index c32fcb4..7688b96 100644 --- a/libs/package-manager.bash.in +++ b/libs/package-manager.bash.in @@ -1,5 +1,5 @@ # -*-eselect-*- vim: ft=eselect -# Copyright (c) 2005-2021 Gentoo Authors +# Copyright (c) 2005-2023 Gentoo Authors # # This file is part of the 'eselect' tools framework. # @@ -209,7 +209,7 @@ env_update() { local noldconfig [[ $1 -ne 0 ]] || noldconfig=y case $(package_manager) in - portage) "@ENV_UPDATE@" ${noldconfig:+--no-ldconfig} ;; + portage) env-update ${noldconfig:+--no-ldconfig} ;; pkgcore) pmaint env-update ${noldconfig:+--skip-ldconfig} ;; paludis) return 127 ;; esac |