|
Line
Link Here
|
| 0 |
-- a/bin/Makefile.am |
0 |
++ b/bin/Makefile.am |
|
Lines 1-8
Link Here
|
| 1 |
bin_SCRIPTS = eselect |
1 |
bin_SCRIPTS = eselect |
| 2 |
EXTRA_DIST = eselect.in |
2 |
EXTRA_DIST = eselect.in |
| 3 |
|
3 |
|
| 4 |
dosed = @SED@ -e 's%\@BASH\@%$(BASH)%g' \ |
4 |
dosed = @SED@ -e 's%\@DATADIR\@%$(datadir)%g' \ |
| 5 |
-e 's%\@DATADIR\@%$(datadir)%g' \ |
|
|
| 6 |
-e 's%\@EPREFIX\@%$(EPREFIX)%g' \ |
5 |
-e 's%\@EPREFIX\@%$(EPREFIX)%g' \ |
| 7 |
-e 's%\@VERSION\@%$(VERSION)$(EXTRAVERSION)%g' |
6 |
-e 's%\@VERSION\@%$(VERSION)$(EXTRAVERSION)%g' |
| 8 |
|
7 |
|
| 9 |
-- a/bin/eselect.in |
8 |
++ b/bin/eselect.in |
|
Lines 1-4
Link Here
|
| 1 |
#!@BASH@ |
1 |
#!@EPREFIX@/bin/bash |
| 2 |
# -*-eselect-*- vim: ft=eselect |
2 |
# -*-eselect-*- vim: ft=eselect |
| 3 |
# Copyright (c) 2005-2023 Gentoo Authors |
3 |
# Copyright (c) 2005-2023 Gentoo Authors |
| 4 |
# |
4 |
# |
| 5 |
-- a/configure.ac |
5 |
++ b/configure.ac |
|
Lines 8-22
test x$prefix = xNONE && prefix="$ac_default_prefix"
Link Here
|
| 8 |
test x$datadir = xNONE && datadir="$ac_default_datadir" |
8 |
test x$datadir = xNONE && datadir="$ac_default_datadir" |
| 9 |
test x$sysconfdir = xNONE && sysconfdir="$ac_default_sysconfdir" |
9 |
test x$sysconfdir = xNONE && sysconfdir="$ac_default_sysconfdir" |
| 10 |
|
10 |
|
| 11 |
# BASH may already be set in the shell, if the admin then changes the |
|
|
| 12 |
# the /bin/sh symlink to a non-bash shell, all hell will break lose. |
| 13 |
# thanks to James Rowe for the heads up. |
| 14 |
unset BASH |
| 15 |
AC_PATH_PROGS(BASH, bash) |
| 16 |
if test x$BASH = x; then |
| 17 |
AC_MSG_ERROR([bash is required]) |
| 18 |
fi |
| 19 |
|
| 20 |
# AC_PROG_SED doesn't work here, because on Gentoo FreeBSD systems it |
11 |
# AC_PROG_SED doesn't work here, because on Gentoo FreeBSD systems it |
| 21 |
# is confused by a wrapper script that is in the PATH at build time. |
12 |
# is confused by a wrapper script that is in the PATH at build time. |
| 22 |
AC_CHECK_PROGS(SED, [gsed sed]) |
13 |
AC_CHECK_PROGS(SED, [gsed sed]) |
|
Lines 31-39
else
Link Here
|
| 31 |
AC_MSG_ERROR([GNU sed is required]) |
22 |
AC_MSG_ERROR([GNU sed is required]) |
| 32 |
fi |
23 |
fi |
| 33 |
|
24 |
|
| 34 |
AC_PATH_PROG(ENV_UPDATE, env-update, /usr/sbin/env-update, |
|
|
| 35 |
[$PATH:$prefix/sbin:/usr/sbin]) |
| 36 |
|
| 37 |
CANONICALISE="" |
25 |
CANONICALISE="" |
| 38 |
# realpath is included with Coreutils since version 8.15 (2012) |
26 |
# realpath is included with Coreutils since version 8.15 (2012) |
| 39 |
AC_CHECK_PROGS(REALPATH, [grealpath realpath]) |
27 |
AC_CHECK_PROGS(REALPATH, [grealpath realpath]) |
| 40 |
-- a/libs/Makefile.am |
28 |
++ b/libs/Makefile.am |
|
Lines 28-35
EXTRA_DIST = \
Link Here
|
| 28 |
|
28 |
|
| 29 |
dosed = @SED@ \ |
29 |
dosed = @SED@ \ |
| 30 |
-e 's%\@SED\@%@SED@%g' \ |
30 |
-e 's%\@SED\@%@SED@%g' \ |
| 31 |
-e 's%\@PORTAGEQ\@%@PORTAGEQ@%g' \ |
|
|
| 32 |
-e 's%\@ENV_UPDATE\@%@ENV_UPDATE@%g' \ |
| 33 |
-e 's%\@CANONICALISE\@%@CANONICALISE@%g' \ |
31 |
-e 's%\@CANONICALISE\@%@CANONICALISE@%g' \ |
| 34 |
-e 's%\@libdir\@%@libdir@%g' |
32 |
-e 's%\@libdir\@%@libdir@%g' |
| 35 |
|
33 |
|
| 36 |
-- a/libs/package-manager.bash.in |
34 |
++ b/libs/package-manager.bash.in |
|
Lines 209-215
env_update() {
Link Here
|
| 209 |
local noldconfig |
209 |
local noldconfig |
| 210 |
[[ $1 -ne 0 ]] || noldconfig=y |
210 |
[[ $1 -ne 0 ]] || noldconfig=y |
| 211 |
case $(package_manager) in |
211 |
case $(package_manager) in |
| 212 |
portage) "@ENV_UPDATE@" ${noldconfig:+--no-ldconfig} ;; |
212 |
portage) env-update ${noldconfig:+--no-ldconfig} ;; |
| 213 |
pkgcore) pmaint env-update ${noldconfig:+--skip-ldconfig} ;; |
213 |
pkgcore) pmaint env-update ${noldconfig:+--skip-ldconfig} ;; |
| 214 |
paludis) return 127 ;; |
214 |
paludis) return 127 ;; |
| 215 |
esac |
215 |
esac |
