Throw out getpack, replace printenv with a link to env

This commit is contained in:
Erik van der Kouwe 2010-02-03 13:51:26 +00:00
parent 35b471ad94
commit 7c9fe576a8
5 changed files with 10 additions and 53 deletions

View file

@ -26,7 +26,6 @@ usr: \
/usr/bin/expr \ /usr/bin/expr \
/usr/bin/false \ /usr/bin/false \
/usr/bin/getopts \ /usr/bin/getopts \
/usr/bin/getpack \
/usr/bin/read \ /usr/bin/read \
/usr/bin/test \ /usr/bin/test \
/usr/bin/true \ /usr/bin/true \
@ -110,9 +109,6 @@ clean:
/usr/bin/easypack: easypack.sh /usr/bin/easypack: easypack.sh
install -m 755 -c -o bin $? $@ install -m 755 -c -o bin $? $@
/usr/bin/getpack: getpack.sh
install -m 755 -c -o bin $? $@
/usr/bin/checkhier: checkhier.sh /usr/bin/checkhier: checkhier.sh
install -m 755 -c -o bin $? $@ install -m 755 -c -o bin $? $@

View file

@ -1,30 +0,0 @@
#!/bin/sh
if [ $# -ne 1 ]
then echo "Usage: $0 <url>"
exit 1
fi
if [ -z "$HOME" ]
then echo "Where is your \$HOME? "
exit 1
fi
if [ ! -d "$HOME" ]
then echo "Where is your \$HOME ($HOME) ? "
exit 1
fi
tmpdir=$HOME/getpack$$
tmpfile=package
tmpfiletar=$tmpfile.tar
tmpfiletargz=$tmpfile.tar.gz
mkdir -m 700 $tmpdir || exit 1
cd $tmpdir || exit 1
urlget "$1" >$tmpfiletargz
gzip -d $tmpfiletargz || exit 1
tar xf $tmpfiletar || exit 1
make && make install && echo "Ok."

View file

@ -146,7 +146,6 @@ ALL = \
prep \ prep \
printf \ printf \
printroot \ printroot \
printenv \
proto \ proto \
pwd \ pwd \
pwdauth \ pwdauth \
@ -636,10 +635,6 @@ printf: printf.c
$(CCLD) -o $@ $< $(CCLD) -o $@ $<
@install -S 4kw $@ @install -S 4kw $@
printenv: printenv.c
$(CCLD) -o $@ $<
@install -S 4kw $@
printroot: printroot.c printroot: printroot.c
$(CCLD) -o $@ $< $(CCLD) -o $@ $<
@install -S 4kw $@ @install -S 4kw $@
@ -1485,8 +1480,8 @@ install: \
/usr/bin/printf: printf /usr/bin/printf: printf
install -cs -o bin $< $@ install -cs -o bin $< $@
/usr/bin/printenv: printenv /usr/bin/printenv: /usr/bin/env
install -cs -o bin $< $@ install -ls -o bin /usr/bin/env /usr/bin/printenv
/usr/bin/printroot: printroot /usr/bin/printroot: printroot
install -cs -o bin $< $@ install -cs -o bin $< $@

View file

@ -1,12 +0,0 @@
#include <stdio.h>
int main(int argc, char *argv[], char *envp[])
{
int p;
for(p = 0; envp[p] && *envp[p]; p++) {
printf("%s\n", envp[p]);
}
return 0;
}

View file

@ -7,6 +7,11 @@ env \- set environment for command
.RI [ name\fB=\fIvalue "] ..." .RI [ name\fB=\fIvalue "] ..."
.RI [ utility .RI [ utility
.RI [ argument "...]]" .RI [ argument "...]]"
.B printenv
.RB [ \-ia ]
.RI [ name\fB=\fIvalue "] ..."
.RI [ utility
.RI [ argument "...]]"
.SH DESCRIPTION .SH DESCRIPTION
.B Env .B Env
modifies its environment according to the modifies its environment according to the
@ -18,6 +23,9 @@ with the given arguments and the modified environment.
If no utility is specified then the modified environment is printed as If no utility is specified then the modified environment is printed as
.IB name = value .IB name = value
strings, one per line. strings, one per line.
.PP
.B printenv
is identical to env in every way and is included for backward compatibility
.SH OPTIONS .SH OPTIONS
.TP .TP
.B \-i .B \-i