Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24204
Modified Files:
Tag: rel-1-2-patches
shadow
Log Message:
make sure we can copy the script to the 1.3 tree
Index: shadow
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/shadow,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.4
diff -u -d -r1.16.2.3 -r1.16.2.4
--- shadow 16 Oct 2005 00:50:35 -0000 1.16.2.3
+++ shadow 16 Oct 2005 01:00:15 -0000 1.16.2.4
@@ -40,23 +40,23 @@
groupadd -g 15 wheel
fi
- rm -rf $WORKDIR/tmp || exit 1
- mkdir -p $WORKDIR/tmp || exit 1
- make DESTDIR=$WORKDIR/tmp install || exit 1
- chmod 700 $WORKDIR/tmp/bin/login || exit 1
- chmod 4550 $WORKDIR/tmp/bin/su || exit 1
- chgrp wheel $WORKDIR/tmp/bin/su || exit 1
- chmod -c go-rx $WORKDIR/tmp/usr/sbin/{chpasswd,group*,grp[cu]*,logoutd,newusers,pw[cu]*,user*} || exit 1
+ rm -rf $TMPDIR || exit 1
+ mkdir -p $TMPDIR || exit 1
+ make DESTDIR=$TMPDIR install || exit 1
+ chmod 700 $TMPDIR/bin/login || exit 1
+ chmod 4550 $TMPDIR/bin/su || exit 1
+ chgrp wheel $TMPDIR/bin/su || exit 1
+ chmod -c go-rx $TMPDIR/usr/sbin/{chpasswd,group*,grp[cu]*,logoutd,newusers,pw[cu]*,user*} || exit 1
copy_man ./man
- rm -rf $WORKDIR/tmp/usr/share
- rm -rf $WORKDIR/tmp/lib/*.a
- rm -rf $WORKDIR/tmp/lib/*.la
+ rm -rf $TMPDIR/usr/share
+ rm -rf $TMPDIR/lib/*.a
+ rm -rf $TMPDIR/lib/*.la
cp -dpR etc/{limits,login.access,login.def*,useradd} $ETCDIR/etc/ || exit 1
sed 's%^#MD5_CRYPT_ENAB.*no%MD5_CRYPT_ENAB yes%' etc/login.defs > $ETCDIR/etc/login.defs &&
- rm -rf $WORKDIR/tmp/usr/share || exit 1
- rm -rf $WORKDIR/tmp/lib || exit 1
- cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
- rm -rf $WORKDIR/tmp || exit 1
+ rm -rf $TMPDIR/usr/share || exit 1
+ rm -rf $TMPDIR/lib || exit 1
+ cp -dpR $TMPDIR/* $CDDIR/ || exit 1
+ rm -rf $TMPDIR || exit 1
;;
* )
|