From af720295fdf7576e19d0def6f352aedd184a3744 Mon Sep 17 00:00:00 2001 From: James Peach Date: Wed, 23 May 2007 19:10:04 +0000 Subject: r23093: Allow modules with the same name but different types. (This used to be commit 190a69b1f9d7a0f858ed56c505c2d3c473273463) --- source3/script/installmodules.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'source3') diff --git a/source3/script/installmodules.sh b/source3/script/installmodules.sh index f6e52880fe..f70db003ed 100755 --- a/source3/script/installmodules.sh +++ b/source3/script/installmodules.sh @@ -19,11 +19,19 @@ fi 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 -- cgit