diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2005-03-05 16:06:46 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2005-03-05 16:06:46 +0000 |
| commit | 5821f9eb628ecc8ef81363b55415b151eff03ee8 (patch) | |
| tree | 5bcf0906dbaab082883d3917f286c04565b22f97 | |
| parent | making it work for icc as well as gcc (diff) | |
| download | historical-5821f9eb628ecc8ef81363b55415b151eff03ee8.tar.gz historical-5821f9eb628ecc8ef81363b55415b151eff03ee8.tar.bz2 historical-5821f9eb628ecc8ef81363b55415b151eff03ee8.zip | |
Made output nicer in the config script
Package-Manager: portage-2.0.51.19
| -rw-r--r-- | net-dialup/fcdsl/Manifest | 2 | ||||
| -rw-r--r-- | net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest index 5413d0a70721..2a509ad1c30e 100644 --- a/net-dialup/fcdsl/Manifest +++ b/net-dialup/fcdsl/Manifest @@ -2,7 +2,7 @@ MD5 dd45a2d2b1c049503c3444b4ce0c9e0d fcdsl-2.6.20.7-r3.ebuild 7673 MD5 04cbd0d05d96a8067a967e10ea4baf85 fcdsl-2.6.20.7-r2.ebuild 7723 MD5 77ff66c5cca425b1ffe33e1082fc2ccf ChangeLog 2521 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 -MD5 9c84ee716c44c13735a45f6b8bd92ac5 fcdsl-2.6.20.7-r4.ebuild 7349 +MD5 ae2409fa2559d25cecf4c69bbb691611 fcdsl-2.6.20.7-r4.ebuild 7398 MD5 35e156955da1166d6de5e56bb66857db files/fcdslslusb.diff 4002 MD5 776e0c65eda5432a30f9beae8896ca97 files/fcdslsl.diff 1896 MD5 22a65f3dcb8b67dc53a23ef35886bf18 files/fcdsl.diff 4636 diff --git a/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild b/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild index f010799b171b..2a8b9fe951d4 100644 --- a/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild +++ b/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild,v 1.2 2005/03/04 13:09:49 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild,v 1.3 2005/03/05 16:06:46 genstef Exp $ inherit linux-mod eutils @@ -222,11 +222,11 @@ pkg_config() { readvalue FCDSL_PROVIDER "Enter the name of your ISP" if [ ! -e "/etc/ppp/peers/${FCDSL_PROVIDER}" ]; then readvalue FCDSL_USER "Enter your user name" - if [ "$(grep "${FCDSL_USER}" /etc/ppp/pap-secrets)" == "" ]; then + if ! grep "${FCDSL_USER}" /etc/ppp/pap-secrets >/dev/null 2>&1; then readpassword FCDSL_PASSWORD echo '"'${FCDSL_USER}'" * "'${FCDSL_PASSWORD}'"' >>/etc/ppp/pap-secrets unset FCDSL_PASSWORD - cat <<EOF >>/etc/ppp/peers/${FCDSL_PROVIDER} + cat <<EOF >/etc/ppp/peers/${FCDSL_PROVIDER} connect "" ipcp-accept-remote ipcp-accept-local @@ -260,18 +260,20 @@ EOF einfo "or" einfo " pppd call \"${FCDSL_PROVIDER}\"" else - ewarn "User \"${FCDSL_USER}\" always exists in \"/etc/ppp/pap-secrets\"!" + ewarn "User \"${FCDSL_USER}\" already exists in \"/etc/ppp/pap-secrets\"!" fi else - ewarn "Peer file \"/etc/ppp/peers/${FCDSL_PROVIDER}\" always exists!" + ewarn "Peer file \"/etc/ppp/peers/${FCDSL_PROVIDER}\" already exists!" fi #Uncomment correspondent lines in /etc/capi.conf & /etc/modules.d/fcdsl if [ -f /etc/capi.conf ]; then - sed -i -e "s:^#${FCDSL_MODULE}:${FCDSL_MODULE}" /etc/capi.conf + sed -i -e "s:^#${FCDSL_MODULE}:${FCDSL_MODULE}:" \ + /etc/capi.conf >/dev/null 2>&1 fi if [ -f /etc/modules.d/fcdsl ]; then - sed -i -e "s:^#options +${FCDSL_MODULE}:options ${FCDSL_MODULE}" /etc/modules.d/fcdsl + sed -i -e "s:^#options ${FCDSL_MODULE}:options ${FCDSL_MODULE}:" \ + /etc/modules.d/fcdsl >/dev/null 2>&1 fi else ewarn "No AVM FRITZ!Card DSL found!" |