Author: jpeach Date: 2007-05-23 19:10:04 +0000 (Wed, 23 May 2007) New Revision: 23093
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23093 Log: Allow modules with the same name but different types. Modified: branches/SAMBA_3_0/source/script/installmodules.sh branches/SAMBA_3_0_26/source/script/installmodules.sh Changeset: Modified: branches/SAMBA_3_0/source/script/installmodules.sh =================================================================== --- branches/SAMBA_3_0/source/script/installmodules.sh 2007-05-23 15:28:47 UTC (rev 23092) +++ branches/SAMBA_3_0/source/script/installmodules.sh 2007-05-23 19:10:04 UTC (rev 23093) @@ -19,11 +19,19 @@ fi done +# We expect the last component of LIBDIR to be the module type, eg. idmap, +# pdb. By stripping this from the installation name, you can have multiple +# modules of the same name but different types by creating eg. idmap_foo +# and pdb_foo. This makes the most sense for idmap and pdb module, where +# they need to be consistent. +mtype=`basename $LIBDIR` + for p in $*; do p2=`basename $p` - echo Installing $p as $DESTDIR/$LIBDIR/$p2 - cp -f $p $DESTDIR/$LIBDIR/ - chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$p2 + name=`echo $p2 | sed -es/${mtype}_//` + echo Installing $p as $DESTDIR/$LIBDIR/$name + cp -f $p $DESTDIR/$LIBDIR/$name + chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$name done exit 0 Modified: branches/SAMBA_3_0_26/source/script/installmodules.sh =================================================================== --- branches/SAMBA_3_0_26/source/script/installmodules.sh 2007-05-23 15:28:47 UTC (rev 23092) +++ branches/SAMBA_3_0_26/source/script/installmodules.sh 2007-05-23 19:10:04 UTC (rev 23093) @@ -19,11 +19,19 @@ fi done +# We expect the last component of LIBDIR to be the module type, eg. idmap, +# pdb. By stripping this from the installation name, you can have multiple +# modules of the same name but different types by creating eg. idmap_foo +# and pdb_foo. This makes the most sense for idmap and pdb module, where +# they need to be consistent. +mtype=`basename $LIBDIR` + for p in $*; do p2=`basename $p` - echo Installing $p as $DESTDIR/$LIBDIR/$p2 - cp -f $p $DESTDIR/$LIBDIR/ - chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$p2 + name=`echo $p2 | sed -es/${mtype}_//` + echo Installing $p as $DESTDIR/$LIBDIR/$name + cp -f $p $DESTDIR/$LIBDIR/$name + chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$name done exit 0
